单盘入库可以不放料盘

source/ACSingleStore/记录.txt

@@ -203,6 +203,8 @@ IO模块读取时间改为可配置。
 
 
 
 
 门锁未关闭时不能点关闭门锁。
 门锁未关闭时不能点关闭门锁。
+取出料盘过程中，如果X12亮，批量轴先匀速下降至X12不亮，然后再打开仓门。
+单盘入库，如果没有放入料盘就关闭仓门，叉子退回后直接结束入库。
 
 
 
 
 
 

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -642,15 +642,26 @@ namespace OnlineStore.DeviceLibrary
                 AutomaticBaiting.IsWaitTragGo = true;
                 AutomaticBaiting.IsWaitTragGo = true;
                 StoreMove.WaitList.Add(WaitResultInfo.WaitTakeTray());
                 StoreMove.WaitList.Add(WaitResultInfo.WaitTakeTray());
                 AutomaticBaiting.WaitIoValue = IO_VALUE.HIGH;
                 AutomaticBaiting.WaitIoValue = IO_VALUE.HIGH;
-                StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
+               // StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
             }
             }
             else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_33_WaitTray))
             else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_33_WaitTray))
             {
             {
-                InStoreLog("入库：SIS_34  确认放入料盘，关闭仓门，升降轴走门口P7，压紧轴压紧  ");
-                StoreMove.NextMoveStep(StoreMoveStep.SIS_34_GetTray);
-                CloseDoorAndWait(); 
-                ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_Door_P7, Config.UpDownAxis_P4_Speed);
-                ComMoveToPosition(moveP.ComPress_P2);
+                //判断是否放入料盘
+                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
+                {
+                    InStoreLog("入库：SI_13  单盘入库未放入料盘，关闭仓门，进出轴至P1(待机点) "); 
+                    StoreMove.NextMoveStep(StoreMoveStep.SI_13_InoutBack);
+                    CloseDoorAndWait();
+                    InOutBackToP1(moveP.InOut_P1);
+                }
+                else
+                {
+                    InStoreLog("入库：SIS_34  确认放入料盘，关闭仓门，升降轴走门口P7，压紧轴压紧  ");
+                    StoreMove.NextMoveStep(StoreMoveStep.SIS_34_GetTray);
+                    CloseDoorAndWait();
+                    ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_Door_P7, Config.UpDownAxis_P4_Speed);
+                    ComMoveToPosition(moveP.ComPress_P2);
+                }
             }
             }
             else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_34_GetTray))
             else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_34_GetTray))
             {
             {

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -673,10 +673,10 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     return ResourceControl.GetString(ResourceControl.TakeTrayOut, "Take out reel manually") + " 失败，请先拿走料盘" ; 
                     return ResourceControl.GetString(ResourceControl.TakeTrayOut, "Take out reel manually") + " 失败，请先拿走料盘" ; 
                 }
                 }
-                else
-                { 
-                    return ResourceControl.GetString(ResourceControl.TakeTrayOut, "Take out reel manually") + " 失败，请先放入料盘";
-                }
+                //else
+                //{ 
+                //    return ResourceControl.GetString(ResourceControl.TakeTrayOut, "Take out reel manually") + " 失败，请先放入料盘";
+                //}
             }
             }
             IsWaitTragGo = false;
             IsWaitTragGo = false;
             IsGetTrayGo = true;
             IsGetTrayGo = true;