1

DeviceLibrary/theMachine/BoxTransport.cs

@@ -476,6 +476,11 @@ namespace DeviceLibrary
                             MoveInfo.EndMove();
                             MoveInfo.EndMove();
                             ErrMsgTxt = "";
                             ErrMsgTxt = "";
                         }
                         }
+                        else
+                        {
+                            MoveInfo.NextMoveStep(MoveStep.StoreTS16);
+                            MoveInfo.log($"{storeMoveType}:放完料后料叉机构料盘检测X30亮，去单料口");
+                        }
                         //else
                         //else
                         //    Msg.add(crc.GetString(L.in_store_detect_material, "放料后料叉X30上仍然检测到物料,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
                         //    Msg.add(crc.GetString(L.in_store_detect_material, "放料后料叉X30上仍然检测到物料,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
                     }
                     }

DeviceLibrary/theMachine/MainMachine.cs

@@ -564,11 +564,12 @@ namespace DeviceLibrary
                     StoreMoveInfo.NewMove(MoveStep.Wait);
                     StoreMoveInfo.NewMove(MoveStep.Wait);
                     ClampMoveInfo.NewMove(MoveStep.Wait);
                     ClampMoveInfo.NewMove(MoveStep.Wait);
                     boxTransport.Reset();
                     boxTransport.Reset();
-                    ResetMoveInfo.log("回原完成");
+                    bool x30 = IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH);
+                    ResetMoveInfo.log($"回原完成,X30状态={(x30 ? "ON" : "OFF")}");
                     ResetMoveInfo.EndMove();
                     ResetMoveInfo.EndMove();
                     OutSingleJobList.ClearLastPosid("");
                     OutSingleJobList.ClearLastPosid("");
                     OutStoreJobList.ClearLastPosid("");
                     OutStoreJobList.ClearLastPosid("");
-                    if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH) && boxTransport.IsComplateOrFree && ClampMoveInfo.MoveStep == MoveStep.Wait)
+                    if (x30)// && boxTransport.IsComplateOrFree && ClampMoveInfo.MoveStep == MoveStep.Wait
                     {
                     {
                         StoreMoveInfo.NewMove(MoveStep.StoreOut_NGPre);
                         StoreMoveInfo.NewMove(MoveStep.StoreOut_NGPre);
                         StoreMoveInfo.MoveParam.PosID = "NG";
                         StoreMoveInfo.MoveParam.PosID = "NG";