Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -233,7 +233,7 @@ namespace UAS_MES.Make
                             else
                             {
                                 //满箱之后采集下一个之前自动清除内容，生成新的箱号
-                                if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || pa_status.Text == "1")
+                                if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || (AutoGenBoxCode.Checked && pa_status.Text == "1"))
                                 {
                                     pa_currentqty.Text = "";
                                     pa_outboxcode.Text = "";

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -305,7 +305,7 @@ namespace UAS_MES.Make
                             else
                             {
                                 //满箱之后采集下一个之前自动清除内容，生成新的箱号
-                                if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || pa_status.Text == "1")
+                                if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || (AutoGenBoxCode.Checked && pa_status.Text == "1"))
                                 {
                                     pa_currentqty.Text = "";
                                     pa_outboxcode.Text = "";