Merge remote-tracking branch 'refs/remotes/origin/master'

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;

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -56,8 +56,8 @@
             this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.ob_nowcheckqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -801,9 +801,9 @@
         private System.Windows.Forms.Label ob_makecode_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;

UAS-MES/FunctionCode/OQC/OQC_CheckNoSplit.Designer.cs

@@ -31,9 +31,9 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OQC_CheckNoSplit));
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_checkno_label = new System.Windows.Forms.Label();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.obd_outboxcode_label = new System.Windows.Forms.Label();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.ms_sncode_label = new System.Windows.Forms.Label();
             this.ob_prodcode_label = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
@@ -455,9 +455,9 @@
 
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private System.Windows.Forms.Label ob_prodcode_label;
         private System.Windows.Forms.Label pr_detail_label;

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.designer.cs

@@ -62,9 +62,9 @@
             this.oi_sampleqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_nowcheckqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.ChooseAll = new UAS_MES.CustomControl.ButtonUtil.ChooseAllButton();
             this.ob_reworkcode = new System.Windows.Forms.Label();
             this.ob_source = new System.Windows.Forms.Label();
@@ -658,13 +658,13 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_nowcheckqty;
         private System.Windows.Forms.Label ob_batchqty_label;

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.Designer.cs

@@ -67,7 +67,7 @@
             this.bc_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bc_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.CheckTypeDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
             this.choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.oi_itemcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -89,7 +89,7 @@
             this.BatchPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.勾选 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.ob_batchqty_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -1027,7 +1027,7 @@
 
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
@@ -1048,7 +1048,7 @@
         private CustomControl.ButtonUtil.ArrowLeftButton WaitReject;
         private System.Windows.Forms.Label label9;
         private CustomControl.DataGrid_View.DataGridViewWithCheckBox CheckTypeDGV;
-        private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox sncode;
         private System.Windows.Forms.Label sncode_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_remark;
         private System.Windows.Forms.Label ob_remark_label;

UAS-MES/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -49,7 +49,7 @@
             this.pictureBox3 = new System.Windows.Forms.PictureBox();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
-            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.ma_code_label = new System.Windows.Forms.Label();
             this.ma_code = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).BeginInit();
@@ -348,7 +348,7 @@
 
         #endregion
         private System.Windows.Forms.Label sn_code_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox sn_code;
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.PictureBox pictureBox2;
         private System.Windows.Forms.Label label2;

UAS-MES/FunctionCode/Query/Query_OnlineTraceBack.Designer.cs

@@ -150,7 +150,7 @@
             this.Query.DownImage = ((System.Drawing.Image)(resources.GetObject("Query.DownImage")));
             this.Query.Image = null;
             this.Query.IsShowBorder = true;
-            this.Query.Location = new System.Drawing.Point(1176, 16);
+            this.Query.Location = new System.Drawing.Point(1156, 24);
             this.Query.MoveImage = ((System.Drawing.Image)(resources.GetObject("Query.MoveImage")));
             this.Query.Name = "Query";
             this.Query.NormalImage = ((System.Drawing.Image)(resources.GetObject("Query.NormalImage")));

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.Designer.cs

@@ -41,7 +41,7 @@
             this.palletBtn = new System.Windows.Forms.RadioButton();
             this.serBtn = new System.Windows.Forms.RadioButton();
             this.bigboxBtn = new System.Windows.Forms.RadioButton();
-            this.input = new System.Windows.Forms.TextBox();
+            this.input = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.pi_id = new System.Windows.Forms.Label();
             this.pi_type = new System.Windows.Forms.Label();
             this.bindingSource = new System.Windows.Forms.BindingSource(this.components);
@@ -515,7 +515,7 @@
         private System.Windows.Forms.RadioButton palletBtn;
         private System.Windows.Forms.RadioButton serBtn;
         private System.Windows.Forms.RadioButton bigboxBtn;
-        private System.Windows.Forms.TextBox input;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox input;
         private CustomControl.CustomCheckBox.CustomCheckBox cancel;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.CustomCheckBox.CustomCheckBox pi_type_check;

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.Designer.cs

@@ -30,7 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             this.label8 = new System.Windows.Forms.Label();
-            this.input = new System.Windows.Forms.TextBox();
+            this.input = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.bigboxBtn = new System.Windows.Forms.RadioButton();
             this.serBtn = new System.Windows.Forms.RadioButton();
             this.palletBtn = new System.Windows.Forms.RadioButton();
@@ -250,7 +250,7 @@
         private CustomControl.ValueLabel.ValueLabel getqty;
         private System.Windows.Forms.Label label8;
         private CustomControl.CustomCheckBox.CustomCheckBox cancel;
-        private System.Windows.Forms.TextBox input;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox input;
         private System.Windows.Forms.RadioButton bigboxBtn;
         private System.Windows.Forms.RadioButton serBtn;
         private System.Windows.Forms.RadioButton palletBtn;