称重窗口关闭错误修改

UAS-MES/FunctionCode/Make/Make_BigBoxWeight.cs

@@ -239,15 +239,20 @@ namespace UAS_MES.Make
 
         private void StopWeight_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
 
         private void Make_BigBoxWeight_FormClosing(object sender, FormClosingEventArgs e)
         {
             BaseUtil.ClosePrint(lbl);
             StopWeight.PerformClick();
+            InitPrint.Abort();
             if (serialPort1.IsOpen)
             {
                 GetData = false;

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -215,9 +215,13 @@ namespace UAS_MES.Make
         //停止进程，关闭串口
         private void StopWeight_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
 
         //关闭窗口的时候停止进程，不再读取串口数据
@@ -225,6 +229,7 @@ namespace UAS_MES.Make
         {
             BaseUtil.ClosePrint(lbl);
             StopWeight.PerformClick();
+            InitPrint.Abort();
             if (serialPort1.IsOpen)
             {
                 GetData = false;

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -226,13 +226,13 @@ namespace UAS_MES.Make
         {
             BaseUtil.ClosePrint(lbl);
             StopWeight.PerformClick();
+            InitPrint.Abort();
             if (serialPort1.IsOpen)
             {
                 GetData = false;
                 serialPort1.Close();
                 SystemInf.OpenPort.Remove(serialPort1.PortName);
                 thread.Interrupt();
-                thread.Join();
             }
             //thread.Abort();
         }
@@ -272,9 +272,13 @@ namespace UAS_MES.Make
 
         private void StopWeight_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
 
         private void pr_code_TextChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -434,7 +434,6 @@ namespace UAS_MES.Make
                 thread.Interrupt();
             }
             //thread.Abort();
-            dh.Dispose();
         }
 
         private void Packing_Click(object sender, EventArgs e)
@@ -450,7 +449,7 @@ namespace UAS_MES.Make
                     pa_standardqty.Text = "";
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱采集", "封箱成功", pa_outboxcode.Text, "");
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "封箱成功\n", Color.Green);
-                    if (PR_CHECKCARTONW != "0")
+                    if (PR_CHECKCARTONW != "0"&& pa_standardqty.Text == pa_currentqty.Text)
                     {
                         float weigh = float.Parse(weight.Text.Replace("kg", "").Trim());
                         if (!(weigh > MinWeight && weigh < MaxWeight))

UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -227,9 +227,13 @@ namespace UAS_MES.Make
         //停止称重
         private void stopWeigh_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
         private void getSerialData()
         {
@@ -262,6 +266,8 @@ namespace UAS_MES.Make
         private void Make_PalletWeigh_FormClosing(object sender, FormClosingEventArgs e)
         {
             BaseUtil.ClosePrint(lbl);
+            stopWeigh.PerformClick();
+            InitPrint.Abort();
             if (serialPort1.IsOpen)
             {
                 GetData = false;

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -339,7 +339,6 @@ namespace UAS_MES.Make
                 thread.Interrupt();
             }
             //thread.Abort();
-            dh.Dispose();
         }
 
         private void Packing_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Packing/Packing_ProdWeightSet.cs

@@ -157,9 +157,13 @@ namespace UAS_MES.Packing
         //停止称重
         private void stopWeigh_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
 
         private void confirm_Click(object sender, EventArgs e)
@@ -290,6 +294,7 @@ namespace UAS_MES.Packing
                 SystemInf.OpenPort.Remove(serialPort1.PortName);
                 thread.Interrupt();
             }
+            //thread.Abort();
         }
 
         private void standardWeight_Leave(object sender, EventArgs e)

UAS-MES/FunctionCode/SystemSetting/SystemSetting_ScaleTest.cs

@@ -93,17 +93,25 @@ namespace UAS_MES.SystemSetting
 
         private void SystemSetting_ScaleTest_FormClosing(object sender, FormClosingEventArgs e)
         {
-            StopTest.PerformClick();
-            try { ReadData = false; }
-            catch (Exception) { }
+            if (serialPort1.IsOpen)
+            {
+                ReadData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Interrupt();
+            }
             //thread.Abort();
         }
 
         private void StopTest_Click(object sender, EventArgs e)
         {
-            ReadData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                ReadData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
     }
 }

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1348,7 +1348,7 @@ namespace UAS_MES.PublicMethod
                     }
                     break;
                 case "PROD":
-                    string prodcode = dh.getFieldDataByCondition("mes_package_view", "v_prodcode", "v_outboxcode='" + pa_outboxcode + "'").ToString();
+                    string prodcode = dh.getFieldDataByCondition("package", "pa_prodcode", "pa_outboxcode='" + pa_outboxcode + "'").ToString();
                     if (prodcode != pa_prodcode)
                     {
                         error = ">>当前箱" + outboxcode + "对应物料" + pa_prodcode + "和待装箱号" + pa_outboxcode + "物料" + prodcode + "不相等";