栈板称重修改

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.cs

@@ -27,7 +27,7 @@ namespace UAS_MES_NEW.Packing
         Engine engine;
         SerialPort serialPort1 = new SerialPort();
 
-        Regex re = new Regex("\\d+.\\W+");
+        Regex re = new Regex("\\d+.\\d+");
 
         DataTable Dbfind;
         string ErrorMessage = "";
@@ -1217,14 +1217,15 @@ namespace UAS_MES_NEW.Packing
                         {
                             try
                             {
-                                int len = serialPort1.BytesToRead;
-                                Byte[] readBuffer = new Byte[len];
-                                serialPort1.Read(readBuffer, 0, len); //将数据读入缓存
-                                string weigh = Encoding.Default.GetString(readBuffer);
-                                if (weigh != "")
-                                {
-                                    weight.Text = re.Match(weigh).Value;
-                                }
+                                //int len = serialPort1.BytesToRead;
+                                //Byte[] readBuffer = new Byte[len];
+                                //serialPort1.Read(readBuffer, 0, len); //将数据读入缓存
+                                //string weigh = Encoding.Default.GetString(readBuffer);
+                                //if (weigh != "")
+                                //{
+                                //    weight.Text = re.Match(weigh).Value;
+                                //}
+                                weight.Text = re.Match(serialPort1.ReadLine()).Groups[0].Value;
                             }
                             catch (Exception)
                             {

UAS_MES_YDCY/FunctionCode/Packing/Packing_PalletWeigh.cs

@@ -1,4 +1,5 @@
 using LabelManager2;
+using Seagull.BarTender.Print;
 using System;
 using System.Data;
 using System.Drawing;
@@ -32,6 +33,8 @@ namespace UAS_MES_NEW.Packing
 
         DataTable dt;
 
+        Engine engine;
+
         DataTable listc;
 
         DataTable info;
@@ -75,8 +78,7 @@ namespace UAS_MES_NEW.Packing
         {
             try
             {
-                lbl = new ApplicationClass();
-                BaseUtil.WriteLbl();
+                engine = new Engine(true);
             }
             catch (Exception ex)
             {
@@ -168,7 +170,7 @@ namespace UAS_MES_NEW.Packing
                                 }
                                 //doc = lbl.Documents.Open(PrintLabel.Text);
                                 string ErrorMessage = "";
-                                if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, palletcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
+                                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, palletcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
                                 {
                                     //打印成功，请输入栈板号
                                     OperateResult.AppendText("<<打印成功\n", Color.Green);