出料线体IO不使用

source/AssemblyLineClient/FrmFeedingEquip.Designer.cs

@@ -427,6 +427,7 @@
             this.btnOLine.TabIndex = 268;
             this.btnOLine.TabIndex = 268;
             this.btnOLine.Text = "SL出料线体运转";
             this.btnOLine.Text = "SL出料线体运转";
             this.btnOLine.UseVisualStyleBackColor = false;
             this.btnOLine.UseVisualStyleBackColor = false;
+            this.btnOLine.Visible = false;
             this.btnOLine.Click += new System.EventHandler(this.btnOLine_Click);
             this.btnOLine.Click += new System.EventHandler(this.btnOLine_Click);
             // 
             // 
             // btnBStopDown
             // btnBStopDown

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -680,7 +680,7 @@ namespace OnlineStore.DeviceLibrary
                         ProcessShelfOut = true;
                         ProcessShelfOut = true;
                         //出口阻挡下降，出口线体转动 
                         //出口阻挡下降，出口线体转动 
                         IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.HIGH);
                         IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.HIGH);
-                        IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.HIGH);
+                        IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.HIGH);
 
 
                         bool result = WaitIo(IO_Type.SL_Out_Check, IO_VALUE.LOW, 60000);
                         bool result = WaitIo(IO_Type.SL_Out_Check, IO_VALUE.LOW, 60000);
                         if (!result)
                         if (!result)
@@ -694,7 +694,7 @@ namespace OnlineStore.DeviceLibrary
                         //再转动2000
                         //再转动2000
                         Thread.Sleep(3000);
                         Thread.Sleep(3000);
                         //停止转动 ,阻挡上升
                         //停止转动 ,阻挡上升
-                        IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
+                        IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.LOW);
                         IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
                         IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
                         AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.FinishLeave);
                         AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.FinishLeave);
                         Task.Factory.StartNew(delegate
                         Task.Factory.StartNew(delegate
@@ -716,7 +716,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 finally
                 finally
                 {
                 {
-                    IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
+                    IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.LOW);
                     ProcessShelfOut = false;
                     ProcessShelfOut = false;
                 }
                 }
             });
             });

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -415,8 +415,11 @@ namespace OnlineStore.DeviceLibrary
             runStatus = LineRunStatus.Wait;
             runStatus = LineRunStatus.Wait;
 
 
             LineServer.StopServer();
             LineServer.StopServer();
-            LogUtil.info(Name + "RFIDManager.Close");
-            RFIDManager.Close();
+            Task.Factory.StartNew(delegate
+            {
+                LogUtil.info(Name + "RFIDManager.Close");
+                RFIDManager.Close();
+            });
             TimeSpan span = DateTime.Now - StartTime;
             TimeSpan span = DateTime.Now - StartTime;
             LogUtil.info( Name + ",停止运行，总运行时间：" + span.ToString());
             LogUtil.info( Name + ",停止运行，总运行时间：" + span.ToString());
         }
         }

source/DeviceLibrary/assemblymanager/RFIDManagercs.cs

@@ -151,6 +151,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
+                LogUtil.info("调用 RFIDAutoReader.CloseAll");
                 RFIDAutoReader.CloseAll();
                 RFIDAutoReader.CloseAll();
             }
             }
             catch (Exception ex)
             catch (Exception ex)
@@ -159,6 +160,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             try
             try
             {
             {
+                LogUtil.info("调用 RFIDReader.CloseAll");
                 RFIDReader.CloseAll();
                 RFIDReader.CloseAll();
             }
             }
             catch (Exception ex)
             catch (Exception ex)

source/DeviceLibrary/deviceLibrary/RFID/RFIDReader.cs

@@ -47,6 +47,13 @@ namespace Asa.RFID
             {
             {
                 loop = false; 
                 loop = false; 
                 IsConnect = false;
                 IsConnect = false;
+                try
+                {
+                    tScan.Abort();
+                }catch(Exception ex)
+                {
+                    LOGGER.Info("Close tScan[" + IP + "] error ：" + ex.ToString());
+                }
                 int ErrCode = ReaderA.StaticClassReaderA.CloseNetPort(portIndex);
                 int ErrCode = ReaderA.StaticClassReaderA.CloseNetPort(portIndex);
                 LOGGER.Info("Close RFID [" + IP + "]：" + ErrCode);
                 LOGGER.Info("Close RFID [" + IP + "]：" + ErrCode);
                 return ErrCode;
                 return ErrCode;
@@ -328,7 +335,7 @@ namespace Asa.RFID
 
 
         public static void CloseAll()
         public static void CloseAll()
         {
         {
-            foreach (var rfid in rfidMap.Values)
+            foreach (RFID rfid in rfidMap.Values)
             {
             {
                 rfid.Close();
                 rfid.Close();
             }
             }