修改采集控件

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -179,7 +179,7 @@ namespace UAS_MES.Make
                             {
                                 //如果勾选了自动生成箱号，在封箱或者首次
                                 if (AutoGenBoxCode.Checked && (pa_status.Text == "1" || pa_status.Text == ""))
-                                    pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
                             }
                         }
                         if (pa_outboxcode.Text == "")
@@ -249,7 +249,7 @@ namespace UAS_MES.Make
                                     pa_outboxcode.Text = "";
                                     pa_status.Text = "0";
                                     BaseUtil.CleanDGVData(PackageDetail);
-                                    pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
                                 }
                                 ////箱号不存在的情况
                                 if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "标准", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -255,7 +255,7 @@ namespace UAS_MES.Make
                             else
                             {
                                 if (AutoGenBoxCode.Checked && (pa_status.Text == "1" || pa_status.Text == ""))
-                                    pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
                             }
                         }
                         if (pa_outboxcode.Text == "")
@@ -325,7 +325,7 @@ namespace UAS_MES.Make
                                     pa_outboxcode.Text = "";
                                     pa_status.Text = "0";
                                     BaseUtil.CleanDGVData(PackageDetail);
-                                    pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
                                 }
                                 ////箱号不存在的情况
                                 if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "标准", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -237,7 +237,7 @@ namespace UAS_MES.Make
                             if (dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString() != "")
                                 LoadGridData();
                             else
-                                pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
+                                pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
                         }
                         sql.Clear();
                         sql.Append("select pr_code,ms_prodcode,ms_makecode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,");
@@ -274,7 +274,7 @@ namespace UAS_MES.Make
                                     pa_outboxcode.Text = "";
                                     pa_status.Text = "0";
                                     BaseUtil.CleanDGVData(PackageDetail);
-                                    pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
                                 }
                                 if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "特殊", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))
                                 {

UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -85,7 +85,7 @@
             this.WaitReject = new UAS_MES.CustomControl.ButtonUtil.ArrowLeftButton();
             this.bc_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.bc_groupcode = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SNCodeEnterTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.ma_softversion = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ma_softversion_label = new System.Windows.Forms.Label();
             this.BadInfSource = new System.Windows.Forms.BindingSource(this.components);
@@ -887,7 +887,7 @@
         private System.Windows.Forms.Label ma_qty_label;
         private System.Windows.Forms.Label mc_restqty_label;
         private System.Windows.Forms.Label ms_sncode_label;
-        private CustomControl.TextBoxWithIcon.SNCodeEnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox ms_sncode;
         private System.Windows.Forms.Label bc_groupcode_label;
         private System.Windows.Forms.Label bc_remark_label;
         private CustomControl.ComBoxWithFocus.ComBoxWithFocus bc_groupcode;