稳定版本

DeviceLibrary/theMachine/Common.cs

@@ -6,6 +6,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
+using System.Runtime.ExceptionServices;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -102,6 +103,7 @@ namespace DeviceLibrary
         /// <param name="Label_R_Offset">贴标臂偏移</param>
         /// <param name="labelAngle">贴标角度</param>
         /// <returns></returns>
+        [HandleProcessCorruptedStateExceptions]
         public static Point CalcLabelPoint(ReelParam labelParam, Point org, int Label_R_Offset, int Label_R_Angle_Diff, out int labelAngle)
         {
 
@@ -115,7 +117,14 @@ namespace DeviceLibrary
             Bitmap srcbitmap;
             if (BitmapCache.HasBmp(labelParam.bitmapfilename))
             {
+                try
+                {
                     srcbitmap = BitmapCache.GetBmp(labelParam.bitmapfilename);
+                    var w=srcbitmap.Width;
+                }
+                catch {
+                    srcbitmap = new Bitmap(3648, 3648);
+                }
             }
             else
             {

DeviceLibrary/theMachine/MainMachine.cs

@@ -248,6 +248,8 @@ namespace DeviceLibrary
         }
         public void Stop() {
             mstart = false;
+            PrintJob = null;
+            CurrentPrintJob = null;
             ServerCM.StopConnectServer();
             Thread.Sleep(300);
             Alarm(AlarmType.None);
@@ -349,6 +351,7 @@ namespace DeviceLibrary
                     OutCarMoveInfo.NewMove(MoveStep.Wait);
                     OutMoveInfo.NewMove(MoveStep.Wait);
                     LabelMoveInfo.NewMove(MoveStep.Wait);
+                    PrintMoveInfo.NewMove(MoveStep.Wait);
                     CylinderMove(ResetMoveInfo, IO_Type.Counting_EnterDoor_Close, IO_Type.Counting_EnterDoor_Open, IO_VALUE.LOW);
                     CylinderMove(ResetMoveInfo, IO_Type.Counting_ExitDoor_Close, IO_Type.Counting_ExitDoor_Open, IO_VALUE.LOW);
                     if (IOValue(IO_Type.Counting_Reel_Check).Equals(IO_VALUE.HIGH))

DeviceLibrary/theMachine/MainMachine_PrinterProcess.cs

@@ -22,7 +22,7 @@ namespace DeviceLibrary
             CountMoveInfo.log("打印时 Code:" + String.Join("##", cc));
         }
 
-        readonly MoveInfo PrintMoveInfo = new MoveInfo("", false);
+        readonly MoveInfo PrintMoveInfo = new MoveInfo("打印机", false);
         ReelParam PrintJob = null;
         ReelParam CurrentPrintJob = null;
         Task<(bool, string)> PrintTask = null;
@@ -51,7 +51,7 @@ namespace DeviceLibrary
                 case MoveStep.Print_02:
                     if (PrintTask.IsCompleted)
                     {
-                        var (result,msg) = PrintTask.Result;
+                        var (result, msg) = PrintTask.Result;
                         if (result)
                         {
                             PrintMoveInfo.NextMoveStep(MoveStep.Print_04);
@@ -66,6 +66,9 @@ namespace DeviceLibrary
                             PrintMoveInfo.log("打印失败,再次打印");
                         }
                     }
+                    else if (PrintMoveInfo.IsTimeOut(30)) {
+                        Msg.add("打印标签超时请检查打印机状态", MsgLevel.alarm);
+                    }
                     break;
                 case MoveStep.Print_04:
                     PrintMoveInfo.NextMoveStep(MoveStep.Print_WaitTakeLabel);