1

source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs

@@ -372,6 +372,12 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I02_MoveToUp))
             {
+                if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial) == IO_VALUE.LOW)
+                {
+                    StoreMove.NextMoveStep(StoreMoveStep.AUTO_I02_MoveReUp);
+                    InStoreLog(" 轴重新上升后没有检测到料盘，重新上升");
+                    return;
+                }
                 IsNeedScanCode();
             }
             else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I03_ScanCode))
@@ -419,9 +425,9 @@ namespace OnlineStore.DeviceLibrary
                 bool needCheck = StoreManager.Config.DILIst.ContainsKey(IO_Type.Clamping_Check);
 
                 if (IOManager.IOValue(IO_Type.Clamping_Work).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.Clamping_Relax).Equals(IO_VALUE.LOW))
-                //     if (IOManager.IOValue(IO_Type.SuckingDisc_Air).Equals(IO_VALUE.HIGH))
+                //     if (IOManager.IOValue(IO_Type.SuckingDisc_Air).Equals(IO_VALUE.HIGH))(IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial) == IO_VALUE.LOW)
                 {
-                    if ((!needCheck) || IOManager.IOValue(IO_Type.Clamping_Check).Equals(IO_VALUE.HIGH))
+                    if ((!needCheck) || IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW))
                     {
                         StoreMove.NextMoveStep(StoreMoveStep.AUTO_I07_BatchAxisUp);
                         InStoreLog("  批量轴匀速上升【" + StoreManager.Config.BatchAxis_SlowSpeed + "】");
@@ -638,7 +644,7 @@ namespace OnlineStore.DeviceLibrary
             SuckingDisc_WorkCount++;
             InStoreLog("  吸盘开始第" + SuckingDisc_WorkCount + "次工作");
             // IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.HIGH);
-            //  StoreMove.WaitList.Add(WaitResultInfo.WaitTime(500));
+            StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1500));
             // StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.HIGH));
 
             CylinderMove(IO_Type.Clamping_Relax, IO_Type.Clamping_Work, StoreMove);