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

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -214,11 +214,9 @@ namespace UAS_MES.Make
                         if (int.Parse(mcd_remainqty.Text) <= 0)
                         {
                             macode = ma_code.Text;
-                            BaseUtil.CleanForm(this);
                             ErrorMessage = "工单" + macode + "打印结束\n>请输入SN";
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                             sncode.Focus();
-                            return;
                         }
                         else
                         {
@@ -270,7 +268,6 @@ namespace UAS_MES.Make
                             else
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                         }
-
                     }
                     else
                     {

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -340,6 +340,10 @@ namespace UAS_MES.Make
                 {
                     ob_nowcheckqty.ForeColor = Color.Red;
                     OperateResult.AppendText(">>当前采集数量已达到送检数量\n", Color.Red);
+                    if (AutoCut)
+                    {
+                        OperateResult.AppendText(">>批次"+ob_checkno.Text+"自动断批\n", Color.Green);
+                    }
                 }
             }
             else

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -160,17 +160,14 @@ namespace UAS_MES.Make
                             dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
                             BaseUtil.SetFormValue(Controls, dt);
                             mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
-
                             //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
                             if (int.Parse(mcd_remainqty.Text) == 0)
                             {
-                                BaseUtil.CleanForm(this);
                                 OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
                             }
                             //剩余数量不为0
                             else
                             {
-                                //提示用户“>>请输入SN”
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                             }
                         }

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -388,6 +388,10 @@ namespace UAS_MES.Make
                 {
                     ob_nowcheckqty.ForeColor = Color.Red;
                     OperateResult.AppendText(">>当前采集数量已达到送检数量\n", Color.Red);
+                    if (AutoCut)
+                    {
+                        OperateResult.AppendText(">>批次" + ob_checkno.Text + "自动断批\n", Color.Green);
+                    }
                 }
             }
             else

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -474,6 +474,10 @@ namespace UAS_MES.Make
                 {
                     ob_nowcheckqty.ForeColor = Color.Red;
                     OperateResult.AppendText(">>当前采集数量已达到送检数量\n", Color.Red);
+                    if (AutoCut)
+                    {
+                        OperateResult.AppendText(">>批次" + ob_checkno.Text + "自动断批\n", Color.Green);
+                    }
                 }
             }
             else

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -403,6 +403,10 @@ namespace UAS_MES.Make
                 {
                     ob_nowcheckqty.ForeColor = Color.Red;
                     OperateResult.AppendText(">>当前采集数量已达到送检数量\n", Color.Red);
+                    if (AutoCut)
+                    {
+                        OperateResult.AppendText(">>批次" + ob_checkno.Text + "自动断批\n", Color.Green);
+                    }
                 }
             }
             else

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -532,6 +532,10 @@ namespace UAS_MES.Make
                 {
                     ob_nowcheckqty.ForeColor = Color.Red;
                     OperateResult.AppendText(">>当前采集数量已达到送检数量\n", Color.Red);
+                    if (AutoCut)
+                    {
+                        OperateResult.AppendText(">>批次" + ob_checkno.Text + "自动断批\n", Color.Green);
+                    }
                 }
             }
             else