佳世达3楼备料

source/DeviceLibrary/acFeederLine/FeederLineBean.cs

@@ -301,7 +301,6 @@ namespace OnlineStore.DeviceLibrary
             {
                 il_outstopCheckWarch.Stop();
                 LogUtil.info(" 出料线体出口无料架 ，更改[" + Config.L2_AgvName + "] 状态[None] ");
-                agvClient.OutLine_RFID = "";
                 agvClient.OutLine_None(LastOutShelfId);
             }
 

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -23,7 +23,6 @@ namespace OnlineStore.DeviceLibrary
 
         private static string InLine_Name = ConfigAppSettings.GetValue(Setting_Init.InLine_Name);
         private static string OutLine_Name = ConfigAppSettings.GetValue(Setting_Init.OutLine_Name);
-        public string OutLine_RFID { get; set; } = "";
         #region InLine Action
         /// <summary>
         /// 无状态
@@ -45,7 +44,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// 无状态
         /// </summary>
-        public void OutLine_None(string rfid="")
+        public void OutLine_None(string rfid = "")
         {
             SetStatus(OutLine_Name, rfid, ClientAction.None);
         }
@@ -55,13 +54,8 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         public void OutLine_NeedLeave(string rfid)
         {
-            if (!OutLine_RFID.Equals(rfid))
-            {
-                OutLine_RFID = rfid;
             SetStatus(OutLine_Name, rfid, ClientAction.NeedLeave);
         }
-
-        }
         #endregion
 
         public void Init()
@@ -110,6 +104,7 @@ namespace OnlineStore.DeviceLibrary
             if (IOManager.IOValue(IO_Type.L1_InCheck).Equals(IO_VALUE.LOW) && !InLine_InProcess && name.Equals(InLine_Name))
             {
                 MayEnter(InLine_Name);
+                LineManager.feederLine.UpdateSleep(false);
                 Task.Factory.StartNew(delegate
                 {
                     Feeder_In_Msg = "Feeder In: 等待 L1_InCheck=HIGH";
@@ -163,9 +158,9 @@ namespace OnlineStore.DeviceLibrary
             //}
             if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH) && !OutLine_InProcess && name.Equals(OutLine_Name))
             {
-                MayLeave(OutLine_Name, OutLine_RFID);
-                //LineManager.feederLine.UpdateSleep(false);
-                LineManager.feederLine.StopIOMove(IO_Type.L2_OutStopDown, 1500);
+                MayLeave(OutLine_Name, "");
+                LineManager.feederLine.UpdateSleep(false);
+                LineManager.feederLine.StopIOMove(IO_Type.L2_OutStopDown, 2000);
                 //agvClient.MayLeave(id);
                 //  SetStatus(id, shefId, ClientAction.MayLeave);
                 Feeder_Out_Msg = "Feeder Out: 允许流出料架";
@@ -177,7 +172,7 @@ namespace OnlineStore.DeviceLibrary
                     Thread.Sleep(10000);
                     Feeder_Out_Msg = "Feeder Out: 调用  FinishLeave ";
                     LogUtil.info(Feeder_Out_Msg);
-                    FinishLeave(OutLine_Name, OutLine_RFID);
+                    FinishLeave(OutLine_Name, "");
 
                     Thread.Sleep(5000);
                     Feeder_Out_Msg = "Feeder Out: 处理结束  更新状态为None ";
@@ -303,23 +298,23 @@ namespace OnlineStore.DeviceLibrary
             //        return false;
             //    }
 
-            if (actionMap.ContainsKey(name))
-            {
-                ClientAction currA = actionMap[name]; //相同状态就设置一次
-                if (currA.Equals(action) && (shelfId == "000"))
-                {
-                    return false;
-                }
-                actionMap[name] = action;
+            //if (actionMap.ContainsKey(name))
+            //{
+            //    ClientAction currA = actionMap[name]; //相同状态就设置一次
+            //    if (currA.Equals(action) && (shelfId == "000"))
+            //    {
+            //        return false;
+            //    }
+            //    actionMap[name] = action;
+            //    agvClient.SetStatus(name, shelfId, action, level);
+            //    LogUtil.info("设置 " + name + " [" + shelfId + "] " + action.ToString());
+            //    return true;
+            //}
             agvClient.SetStatus(name, shelfId, action, level);
+            // actionMap.Add(name, action);
             LogUtil.info("设置 " + name + " [" + shelfId + "] " + action.ToString());
             return true;
         }
-            agvClient.SetStatus(name, shelfId, action, level);
-            actionMap.Add(name, action);
-            LogUtil.info("设置 " + name + " ["+ shelfId + "] "+ action.ToString());
-            return true;
-        }
 
         public bool ISConnected()
         {