1

source/DeviceLibrary/storeBean/inputBean/TurnoverBox.cs.cs

@@ -460,12 +460,12 @@ namespace OnlineStore.DeviceLibrary
                 from = this;
                 from = this;
                 to = otherTurnoverBox;
                 to = otherTurnoverBox;
             }
             }
-            else
+            else //当前是B
             {
             {
                 to = this;
                 to = this;
                 from = otherTurnoverBox;
                 from = otherTurnoverBox;
             }
             }
-            tranverseProcess(logname + $"   A开始横移到B:", from, to, istranverse);
+            tranverseProcess(logname + $"   {from.Name}开始横移到{to.Name}:", from, to, istranverse);
 
 
         }
         }
         /// <summary>
         /// <summary>
@@ -481,12 +481,12 @@ namespace OnlineStore.DeviceLibrary
                 from = otherTurnoverBox;
                 from = otherTurnoverBox;
 
 
             }
             }
-            else
+            else//B
             {
             {
                 from = this;
                 from = this;
                 to = otherTurnoverBox;
                 to = otherTurnoverBox;
             }
             }
-            tranverseProcess(logname + $"   B开始横移到A:", from, to, istranverse);
+            tranverseProcess(logname + $"   {from.Name}开始横移到{to.Name}:", from, to, istranverse);
         }
         }
         void tranverseProcess(string logname, TurnoverBox from, TurnoverBox to, bool istranverse)
         void tranverseProcess(string logname, TurnoverBox from, TurnoverBox to, bool istranverse)
         {
         {
@@ -545,7 +545,8 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         public void BoxOutProcess()
         public void BoxOutProcess()
         {
         {
-            if (!ProcessShelfOut) return;
+            if (ProcessShelfEnter) return;
+            if (ProcessShelfOut) return;
             //AGV已到达，将料串送入AGV中
             //AGV已到达，将料串送入AGV中
             Task.Factory.StartNew(delegate
             Task.Factory.StartNew(delegate
             {
             {
@@ -684,12 +685,14 @@ namespace OnlineStore.DeviceLibrary
                     LineStopRun();
                     LineStopRun();
                     ProcessShelfOut = false;
                     ProcessShelfOut = false;
                     recvAGVSig = false;
                     recvAGVSig = false;
+                    LogUtil.info(logName + "   结束");
                 }
                 }
             });
             });
         }
         }
         public void BoxEnterProcess()
         public void BoxEnterProcess()
         {
         {
-            if (!ProcessShelfEnter) return;
+            if (ProcessShelfEnter) return;
+            if (ProcessShelfOut) return;
             Task.Factory.StartNew(delegate
             Task.Factory.StartNew(delegate
             {
             {
                 BoxId = "";
                 BoxId = "";
@@ -746,6 +749,7 @@ namespace OnlineStore.DeviceLibrary
                         {
                         {
                             LogUtil.info(logName + $"已收到 {DI_CacheBackCheck} =High");
                             LogUtil.info(logName + $"已收到 {DI_CacheBackCheck} =High");
                         }
                         }
+                        FinishEnter();
                         DateTime dateTime = DateTime.Now;
                         DateTime dateTime = DateTime.Now;
                         if (ConfigHelper.Config.Get("BoxEnterNeedCompleSig", true))
                         if (ConfigHelper.Config.Get("BoxEnterNeedCompleSig", true))
                         {
                         {
@@ -756,7 +760,7 @@ namespace OnlineStore.DeviceLibrary
                         }
                         }
 
 
                         // Complete();
                         // Complete();
-                        FinishEnter();
+
                         //等待200毫秒后停止转动
                         //等待200毫秒后停止转动
                         Thread.Sleep(2000);
                         Thread.Sleep(2000);
                         LogUtil.info(logName + "等待2000后，停止链条转动");
                         LogUtil.info(logName + "等待2000后，停止链条转动");
@@ -771,7 +775,6 @@ namespace OnlineStore.DeviceLibrary
                         //}
                         //}
                         BoxTranverse(logName);
                         BoxTranverse(logName);
                         ProcessShelfEnter = false;
                         ProcessShelfEnter = false;
-                        LogUtil.info(logName + "   结束");
                     }
                     }
                     else
                     else
                     {
                     {
@@ -796,6 +799,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     ProcessShelfEnter = false;
                     ProcessShelfEnter = false;
                     recvAGVSig = false;
                     recvAGVSig = false;
+                    LogUtil.info(logName + "   结束");
                 }
                 }
             });
             });
         }
         }