发送rfid给服务端

source/DeviceLibrary/acFeederLine/FeederLineBean.cs

@@ -307,6 +307,14 @@ namespace OnlineStore.DeviceLibrary
                 IOManager.CIOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
                 IOManager.CIOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
                 IOManager.CIOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
                 IOManager.CIOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
             }
             }
+            if(IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH))
+            {
+                if(!LastOutShelfId.Equals(agvClient.OutLine_RFID))
+                {
+                    agvClient.OutLine_RFID = LastOutShelfId;
+                    agvClient.OutLine_NeedLeave();
+                }
+            }
 
 
         }
         }
         private Task TranverseTask;
         private Task TranverseTask;

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -158,8 +158,7 @@ namespace OnlineStore.DeviceLibrary
             //}
             //}
             if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH) && !OutLine_InProcess && name.Equals(OutLine_Name))
             if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH) && !OutLine_InProcess && name.Equals(OutLine_Name))
             {
             {
-
-                MayLeave(OutLine_Name);
+                MayLeave(OutLine_Name, OutLine_RFID);
                 //LineManager.feederLine.UpdateSleep(false);
                 //LineManager.feederLine.UpdateSleep(false);
                 LineManager.feederLine.StopIOMove(IO_Type.L2_OutStopDown, 1500);
                 LineManager.feederLine.StopIOMove(IO_Type.L2_OutStopDown, 1500);
                 //agvClient.MayLeave(id);
                 //agvClient.MayLeave(id);
@@ -173,7 +172,7 @@ namespace OnlineStore.DeviceLibrary
                     Thread.Sleep(10000);
                     Thread.Sleep(10000);
                     Feeder_Out_Msg = "Feeder Out: 调用  FinishLeave ";
                     Feeder_Out_Msg = "Feeder Out: 调用  FinishLeave ";
                     LogUtil.info(Feeder_Out_Msg);
                     LogUtil.info(Feeder_Out_Msg);
-                    FinishLeave(OutLine_Name);
+                    FinishLeave(OutLine_Name, OutLine_RFID);
 
 
                     Thread.Sleep(5000);
                     Thread.Sleep(5000);
                     Feeder_Out_Msg = "Feeder Out: 处理结束  更新状态为None ";
                     Feeder_Out_Msg = "Feeder Out: 处理结束  更新状态为None ";
@@ -236,9 +235,9 @@ namespace OnlineStore.DeviceLibrary
             LogUtil.info("MayEnter [" + name + "] ");
             LogUtil.info("MayEnter [" + name + "] ");
         }
         }
 
 
-        public void MayLeave(string name)
+        public void MayLeave(string name,string rfid)
         {
         {
-            SetStatus(name, "", ClientAction.MayLeave);
+            SetStatus(name, rfid, ClientAction.MayLeave);
             if (name.Equals(OutLine_Name))
             if (name.Equals(OutLine_Name))
             {
             {
                 OutLine_InProcess = true;
                 OutLine_InProcess = true;
@@ -272,11 +271,11 @@ namespace OnlineStore.DeviceLibrary
         /// 料架离开产线完成
         /// 料架离开产线完成
         /// </summary>
         /// </summary>
         /// <param name="name"></param>
         /// <param name="name"></param>
-        public void FinishLeave(string name)
+        public void FinishLeave(string name,string rfid="")
         {
         {
             Task.Factory.StartNew(delegate
             Task.Factory.StartNew(delegate
             {
             {
-                SetStatus(name, "", ClientAction.FinishLeave);
+                SetStatus(name, rfid, ClientAction.FinishLeave);
                 Thread.Sleep(15000);
                 Thread.Sleep(15000);
                 if (name.Equals(InLine_Name))
                 if (name.Equals(InLine_Name))
                 {
                 {