修改：启动方法执行2次

source/AssemblyLineClient/App.config

@@ -67,14 +67,14 @@
         <conversionPattern value="[%date][%t]%-5p %m%n" />
         <conversionPattern value="[%date][%t]%-5p %m%n" />
       </layout>
       </layout>
     </appender>
     </appender>
-    <appender name="RfidLog" type="log4net.Appender.RollingFileAppender">
-      <file value="logs/RFID.log"/>
+    <appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
+      <file value="logs/TheRFID.log"/>
       <param name="Encoding" value="UTF-8" />
       <param name="Encoding" value="UTF-8" />
       <appendToFile value="true"/>
       <appendToFile value="true"/>
       <rollingStyle value="Date"/>
       <rollingStyle value="Date"/>
       <datePattern value="yyyy-MM-dd"/>
       <datePattern value="yyyy-MM-dd"/>
       <layout type="log4net.Layout.PatternLayout">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%m%n"/>
+        <conversionPattern value="[%date][%t]%-5p %m%n" />
       </layout>
       </layout>
     </appender>
     </appender>
 
 
@@ -82,9 +82,9 @@
       <level value="Info" />
       <level value="Info" />
       <appender-ref ref="RollingLogFileAppender" />
       <appender-ref ref="RollingLogFileAppender" />
     </logger>
     </logger>
-    <logger name="RfidLog">
+    <logger name="TheRFID">
       <level value="Debug" />
       <level value="Debug" />
-      <appender-ref ref="RfidLog" />
+      <appender-ref ref="TheRFID" />
     </logger>
     </logger>
     <!--<root>
     <!--<root>
       <level value="Info" />
       <level value="Info" />

source/AssemblyLineClient/FrmLineStore.cs

@@ -321,13 +321,18 @@ namespace OnlineStore.AssemblyLine
             LogUtil.info(LOGGER, "开始启动");
             LogUtil.info(LOGGER, "开始启动");
             startTimer.Interval = 300;
             startTimer.Interval = 300;
             startTimer.Elapsed += timer_Elapsed;
             startTimer.Elapsed += timer_Elapsed;
+            startTimer.AutoReset = false;
             startTimer.Enabled = true;
             startTimer.Enabled = true;
             this.timer1.Start();
             this.timer1.Start();
         }
         }
         private delegate void ShowFormDelegate();
         private delegate void ShowFormDelegate();
         void timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         void timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
         {
-            startTimer.Enabled = false;
+            startTimer.Stop();
+            if (lineBean.runStatus > LineRunStatus.Wait)
+            {
+                return;
+            }
             if (lineBean.StartRun())
             if (lineBean.StartRun())
             {
             {
                 BeginInvoke(new ShowFormDelegate(ShowStatus));
                 BeginInvoke(new ShowFormDelegate(ShowStatus));

source/Common/util/LogUtil.cs

@@ -14,7 +14,7 @@ namespace OnlineStore.Common
         public static readonly ILog AIOLog = LogManager.GetLogger("AIOBOXLog");
         public static readonly ILog AIOLog = LogManager.GetLogger("AIOBOXLog");
         private static LogUtil instance = new LogUtil();
         private static LogUtil instance = new LogUtil();
         public   delegate void ShowLog(string msg, Color color);
         public   delegate void ShowLog(string msg, Color color);
-        public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        public static readonly ILog LOGGER = LogManager.GetLogger("RollingLogFileAppender");
         public static readonly ILog rfidLog = LogManager.GetLogger("RfidLog");
         public static readonly ILog rfidLog = LogManager.GetLogger("RfidLog");
         public static Dictionary<int, DateTime> lastErrorLogTime = new Dictionary<int, DateTime>();
         public static Dictionary<int, DateTime> lastErrorLogTime = new Dictionary<int, DateTime>();
 
 

source/DeviceLibrary/assemblymanager/RFIDManagercs.cs

@@ -15,7 +15,10 @@ namespace OnlineStore.DeviceLibrary
     {
     {
         public static Asa.RFID.ReaderAll RfidReader = new ReaderAll();
         public static Asa.RFID.ReaderAll RfidReader = new ReaderAll();
         private static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum);
         private static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum);
-
+        static RFIDManager()
+        { 
+            RfidReader.GetValue += RfidReader_GetValue;
+        }
         public static void Open(string[] iparray)
         public static void Open(string[] iparray)
         { 
         { 
             string path = Application.StartupPath + @"\logs\rfid\";
             string path = Application.StartupPath + @"\logs\rfid\";
@@ -23,7 +26,6 @@ namespace OnlineStore.DeviceLibrary
             //   string[] rfidArray = rfidList.ToArray();
             //   string[] rfidArray = rfidList.ToArray();
             //连接rfip 
             //连接rfip 
             RFIDManager.RfidReader.Open(iparray);
             RFIDManager.RfidReader.Open(iparray);
-            RfidReader.GetValue += RfidReader_GetValue;
         }
         }
 
 
         private static void RfidReader_GetValue(string s)
         private static void RfidReader_GetValue(string s)
@@ -93,7 +95,12 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (String.IsNullOrEmpty(ip).Equals(false) && LineManager.Line.rfidList.Contains(ip))
                 if (String.IsNullOrEmpty(ip).Equals(false) && LineManager.Line.rfidList.Contains(ip))
                 {
                 {
-                    RFIDData data = new RFIDData(RfidReader.Read(ip));
+                    byte[] bdata = RfidReader.Read(ip);
+                    if (bdata == null)
+                    {
+                        LogUtil.error("RFID [ " + ip + " ] 读到数据=null");
+                    }
+                    RFIDData data = new RFIDData(bdata);
                     if (isClear)
                     if (isClear)
                     {
                     {
                         RfidReader.Clear(ip);
                         RfidReader.Clear(ip);

source/LoadCVSLibrary/CSVReaderBase.cs

@@ -83,12 +83,6 @@ namespace OnlineStore.LoadCSVLibrary
         {
         {
             try
             try
             {  
             {  
-                if (File.Exists(filePath))
-                {
-                    File.Delete(filePath);
-                }
-                File.WriteAllLines(filePath, lines, Encoding.GetEncoding("gbk"));
-
                 //备份保存
                 //备份保存
                 try
                 try
                 {
                 {
@@ -105,12 +99,21 @@ namespace OnlineStore.LoadCSVLibrary
                     {
                     {
                         File.Delete(backFile);
                         File.Delete(backFile);
                     }
                     }
-                    File.WriteAllLines(backFile, lines, Encoding.GetEncoding("gbk"));
+                    File.Copy(filePath, backFile, true );
+                   // File.WriteAllLines(backFile, lines, Encoding.GetEncoding("gbk"));
                 }
                 }
                 catch (Exception e)
                 catch (Exception e)
                 {
                 {
                     LOGGER.Error("出错：", e);
                     LOGGER.Error("出错：", e);
                 }
                 }
+
+                if (File.Exists(filePath))
+                {
+                    File.Delete(filePath);
+                }
+                File.WriteAllLines(filePath, lines, Encoding.GetEncoding("gbk"));
+
+             
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {