更改1

source/DeviceLibrary/acFeederLine/FeederLineBean.cs

@@ -290,7 +290,7 @@ namespace OnlineStore.DeviceLibrary
                 && l1_down_sig && span.TotalSeconds > 3)
             {
                 //如果Feeder1出口无料架，放一个料架到出口
-                if (LineManager.checkWatch(ol_noshelfWatch1, 1000))
+                if (LineManager.checkWatch(ol_noshelfWatch1, 5000))
                 {
                     StopIOMove(IO_Type.L1_OutStopDown, StopDownMS);
                     Thread.Sleep(1000);
@@ -341,7 +341,7 @@ namespace OnlineStore.DeviceLibrary
                     //Thread.Sleep(1000);
                     //IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
                     //Thread.Sleep(1000);
-                    LogUtil.info(" 横移机构转移料架超时 [" + IO_Type.L1_StopDown + "] [" + stopwatch.Elapsed.TotalSeconds + "秒]");
+                    LogUtil.info(" 横移机构转移料架超时 [" + IO_Type.L1_StopDown + "] 大于2分钟");
                     //break;
                 }
             }

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -21,6 +21,8 @@ namespace OnlineStore.DeviceLibrary
         public bool D21_InProcess = false;
         public bool D22_InProcess = false;
 
+        private static string InLine_Name = "C21";
+        private static string OutLine_Name = "C22";
         public string D22_RFID { get; set; } = "";
         #region D21 Action
         /// <summary>
@@ -72,8 +74,8 @@ namespace OnlineStore.DeviceLibrary
                     agvClient.AGVFinishLeave += AgvClient_FinishLeave;
                 }
                 actionMap = new Dictionary<string, AsaPL.ClientAction>();
-                agvClient.SetStatus("D21", "", ClientAction.None);
-                agvClient.SetStatus("D22", "", ClientAction.None);
+                agvClient.SetStatus(InLine_Name, "", ClientAction.None);
+                agvClient.SetStatus(OutLine_Name, "", ClientAction.None);
                 agvClient.Connect();
                 LogUtil.info("初始化AGV服务");
             }
@@ -100,9 +102,9 @@ namespace OnlineStore.DeviceLibrary
         /// <param name="name">节点名称</param>
         private void AgvClient_ReadyEnter(string name)
         {
-            if (IOManager.IOValue(IO_Type.L1_InCheck).Equals(IO_VALUE.LOW) && !D21_InProcess && name.Equals("D21"))
+            if (IOManager.IOValue(IO_Type.L1_InCheck).Equals(IO_VALUE.LOW) && !D21_InProcess && name.Equals(InLine_Name))
             {
-                MayEnter("D21");
+                MayEnter(InLine_Name);
                 Task.Factory.StartNew(delegate
                 {
                     Feeder_In_Msg = "Feeder In: 等待 L1_InCheck=HIGH";
@@ -123,7 +125,7 @@ namespace OnlineStore.DeviceLibrary
                     Thread.Sleep(5000);
                     Feeder_In_Msg = "Feeder In: 调用  FinishEnter ";
                     LogUtil.info(Feeder_In_Msg);
-                    FinishEnter("D21");
+                    FinishEnter(InLine_Name);
                     Feeder_In_Msg = "Feeder In: 处理结束  更新状态为None ";
                     LogUtil.info(Feeder_In_Msg);
                     D21_None();
@@ -154,10 +156,10 @@ namespace OnlineStore.DeviceLibrary
             //    D22_InProcess = true;
             //    D22_ReadyLeave = true;
             //}
-            if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH) && !D22_InProcess && name.Equals("D22"))
+            if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH) && !D22_InProcess && name.Equals(OutLine_Name))
             {
 
-                MayLeave("D22");
+                MayLeave(OutLine_Name);
                 //LineManager.feederLine.UpdateSleep(false);
                 LineManager.feederLine.StopIOMove(IO_Type.L2_OutStopDown, 1500);
                 //agvClient.MayLeave(id);
@@ -171,7 +173,7 @@ namespace OnlineStore.DeviceLibrary
                     Thread.Sleep(10000);
                     Feeder_Out_Msg = "Feeder Out: 调用  FinishLeave ";
                     LogUtil.info(Feeder_Out_Msg);
-                    FinishLeave("D22");
+                    FinishLeave(OutLine_Name);
 
                     Thread.Sleep(5000);
                     Feeder_Out_Msg = "Feeder Out: 处理结束  更新状态为None ";
@@ -197,11 +199,11 @@ namespace OnlineStore.DeviceLibrary
         /// <param name="name"></param>
         private void AgvClient_FinishLeave(string name)
         {
-            if (name.Equals("D21"))
+            if (name.Equals(InLine_Name))
             {
                 D21_InProcess = false;
             }
-            else if (name.Equals("D22"))
+            else if (name.Equals(OutLine_Name))
             {
                 D22_InProcess = false;
             }
@@ -227,19 +229,21 @@ namespace OnlineStore.DeviceLibrary
         public void MayEnter(string name)
         {
             SetStatus(name, "", ClientAction.MayEnter);
-            if (name.Equals("D21"))
+            if (name.Equals(InLine_Name))
             {
                 D21_InProcess = true;
             }
+            LogUtil.info("MayEnter [" + name + "] ");
         }
 
         public void MayLeave(string name)
         {
             SetStatus(name, "", ClientAction.MayLeave);
-            if (name.Equals("D22"))
+            if (name.Equals(OutLine_Name))
             {
                 D22_InProcess = true;
             }
+            LogUtil.info("MayLeave [" + name + "] ");
         }
 
         /// <summary>
@@ -253,11 +257,11 @@ namespace OnlineStore.DeviceLibrary
                 SetStatus(name, "", ClientAction.FinishEnter);
 
                 Thread.Sleep(15000);
-                if (name.Equals("D21"))
+                if (name.Equals(InLine_Name))
                 {
                     D21_InProcess = false;
                 }
-                else if (name.Equals("D22"))
+                else if (name.Equals(OutLine_Name))
                 {
                     D22_InProcess = false;
                 }
@@ -274,11 +278,11 @@ namespace OnlineStore.DeviceLibrary
             {
                 SetStatus(name, "", ClientAction.FinishLeave);
                 Thread.Sleep(15000);
-                if (name.Equals("D21"))
+                if (name.Equals(InLine_Name))
                 {
                     D21_InProcess = false;
                 }
-                else if (name.Equals("D22"))
+                else if (name.Equals(OutLine_Name))
                 {
                     D22_InProcess = false;