入库取料时需要判断料盘检测信号。

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -436,9 +436,10 @@ namespace OnlineStore.DeviceLibrary
                     }
                     }
                     else
                     else
                     {
                     {
-                        InStoreLog("入库：SI_07  叉子返回，进出轴至P1 ");
+                        InStoreLog("入库：SI_07  叉子返回，进出轴至P1,检测料仓料盘检测信号 ");
                         StoreMove.NextMoveStep(StoreMoveStep.SI_07_DeviceBackFromDoor);
                         StoreMove.NextMoveStep(StoreMoveStep.SI_07_DeviceBackFromDoor);
                         InOutBackToP1(moveP.InOut_P1);
                         InOutBackToP1(moveP.InOut_P1);
+                        StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.HIGH));
                     }
                     }
                 }
                 }
             }
             }

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -343,6 +343,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             Task.Factory.StartNew(delegate ()
             Task.Factory.StartNew(delegate ()
             {
             {
+                DateTime startTime = DateTime.Now;
                 IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
                 IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
                 string message = "";
                 string message = "";
                 List<string> codeList = CodeManager.CameraScan();
                 List<string> codeList = CodeManager.CameraScan();
@@ -370,7 +371,8 @@ namespace OnlineStore.DeviceLibrary
                     StoreManager.Store.CodeOrInoutMsg = ResourceControl.GetString(ResourceControl.InStoreNoCode, "未扫到二维码，需要将料盘送出");
                     StoreManager.Store.CodeOrInoutMsg = ResourceControl.GetString(ResourceControl.InStoreNoCode, "未扫到二维码，需要将料盘送出");
                     LogUtil.error("未扫到二维码，需要将料盘送出");
                     LogUtil.error("未扫到二维码，需要将料盘送出");
                 }
                 }
-                LogUtil.info("扫码结束：" + LastCode); 
+                TimeSpan span = DateTime.Now - startTime;
+                LogUtil.info("扫码结束["+FormUtil.GetSpanStr(span)+"]：" + LastCode); 
                 IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
                 IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
             });
             });
         }
         }