1

DeviceLibrary/DeviceLibrary/PrinterHelper.cs

@@ -34,7 +34,14 @@ namespace DeviceLibrary
                 dpi = 300;
                 dpi = 300;
             }
             }
             print = new Asa.PrintLabel(Application.StartupPath + "\\Label", dpi);
             print = new Asa.PrintLabel(Application.StartupPath + "\\Label", dpi);
+            print.PrintStatusChanged += Print_PrintStatusChanged;
         }
         }
+
+        private void Print_PrintStatusChanged(Asa.PrintLabel.PrinterStatus sta, string msg)
+        {
+            LogUtil.info($"打印机状态:{sta}, msg:{msg}");
+        }
+
         public static CustPrinterStatus LastPrintStatus = CustPrinterStatus.Unknown;
         public static CustPrinterStatus LastPrintStatus = CustPrinterStatus.Unknown;
         public bool Connection(string port)
         public bool Connection(string port)
         {
         {
@@ -74,35 +81,40 @@ namespace DeviceLibrary
         public bool Print(string labelname, Dictionary<string, string> data, out string msg)
         public bool Print(string labelname, Dictionary<string, string> data, out string msg)
         {
         {
             print.LoadLabel(labelname);
             print.LoadLabel(labelname);
-            if (printDevice==PrintDevice.TSC)
+            if (printDevice == PrintDevice.TSC)
             {
             {
-                LogUtil.error($"TSC_打印数据：{JsonHelper.SerializeObject(data)}" );
+                LogUtil.error($"TSC_打印数据：{JsonHelper.SerializeObject(data)}");
                 TscConfig tscConfig = new TscConfig();
                 TscConfig tscConfig = new TscConfig();
                 tscConfig.Offset = ConfigHelper.Config.Get("Tsc_Offset", -17D);
                 tscConfig.Offset = ConfigHelper.Config.Get("Tsc_Offset", -17D);
                 tscConfig.Speed = ConfigHelper.Config.Get("Tsc_Speed", 9);
                 tscConfig.Speed = ConfigHelper.Config.Get("Tsc_Speed", 9);
                 tscConfig.Density = ConfigHelper.Config.Get("Tsc_Density", 12);
                 tscConfig.Density = ConfigHelper.Config.Get("Tsc_Density", 12);
                 tscConfig.GapOffset = ConfigHelper.Config.Get("Tsc_GapOffset", 0);
                 tscConfig.GapOffset = ConfigHelper.Config.Get("Tsc_GapOffset", 0);
                 tscConfig.Gap = ConfigHelper.Config.Get("Tsc_Gap", 3);
                 tscConfig.Gap = ConfigHelper.Config.Get("Tsc_Gap", 3);
-                if (!print.PrintToTsc_New(data,tscConfig, out TscStauts tscStauts,out Bitmap bmp))
+                if (!print.PrintToTsc_New(data, tscConfig, out TscStauts tscStauts, out Bitmap bmp))
                 {
                 {
                     msg = $"打印失败：{tscStauts.ToString()}";
                     msg = $"打印失败：{tscStauts.ToString()}";
                     LogUtil.error("打印失败原因：" + tscStauts.ToString());
                     LogUtil.error("打印失败原因：" + tscStauts.ToString());
                     return false;
                     return false;
                 }
                 }
-                if (bmp!=null)
+                if (bmp != null)
                 {
                 {
                     string cid = ConfigHelper.Config.Get("CID");
                     string cid = ConfigHelper.Config.Get("CID");
-                    _ = UnifiedDataHandler.PostSmfImageAsync(bmp,new Dictionary<string, string> { {"cid",cid+"_2" } }, bmp.Width, bmp.Height);
-                }                
+                    _ = UnifiedDataHandler.PostSmfImageAsync(bmp, new Dictionary<string, string> { { "cid", cid + "_2" } }, bmp.Width, bmp.Height);
+                }
                 msg = $"打印成功";
                 msg = $"打印成功";
                 return true;
                 return true;
             }
             }
+            else if (printDevice == PrintDevice.Windows) {
+                print.Print(data);
+                msg = "";
+                return true;
+            }
             else
             else
-            {                
+            {
                 var bmp = print.PrintPreview(data);
                 var bmp = print.PrintPreview(data);
                 if (!zebraManger.PrintImage(bmp, out msg))
                 if (!zebraManger.PrintImage(bmp, out msg))
                 {
                 {
-                    if (msg== "上一个标签尚未移走")
+                    if (msg == "上一个标签尚未移走")
                     {
                     {
                         msg = crc.GetString("Res0224", "上一个标签尚未移走");
                         msg = crc.GetString("Res0224", "上一个标签尚未移走");
                     }
                     }