恢复贴标超时后自动继续

RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Partial.cs

@@ -661,7 +661,7 @@ namespace OnlineStore.DeviceLibrary
             else if (SecMoveInfo.IsStep(StepEnum.OL03_PrintLabel))
             {
                 bool isPrintOk = RobotManager.LastPrintStatus.Equals(Asa.PrintLabel.PrinterStatus.Idle);
-                bool isTimeOut = SecMoveInfo.IsTimeOut(12000);
+                bool isTimeOut = SecMoveInfo.IsTimeOut(90);
                 if (printTask == null || printTask.IsCompleted)
                 {
                     if (isPrintOk || isTimeOut || (!NeedPrint))
@@ -670,7 +670,8 @@ namespace OnlineStore.DeviceLibrary
                         ClearTimeoutAlarm("打印标签任务完成");
 
                         SecMoveInfo.NextMoveStep(StepEnum.OL05_TakeBack);
-                        SecWorkLog("贴标:  打印结束[" + RobotManager.LastPrintStatus + "][" + (isTimeOut ? "超时120秒" : "") + "], ");
+                        SecWorkLog("贴标:  打印结束[" + RobotManager.LastPrintStatus + "][" + (isTimeOut ? "超时90秒" : "") + "], ");
+                        RobotManager.LastPrintStatus = Asa.PrintLabel.PrinterStatus.Idle;
                         //CylinderMove(SecMoveInfo, IO_Type.TakeCode_Forward, IO_Type.TakeCode_Back);
                         NeedAlarm = false;
                         printTask = null;