将部分验证逻辑替换为存储过程执行

UAS-MES/CustomControl/CustomCheckBox/LockCheckBox.Designer.cs

@@ -32,6 +32,7 @@
             // 
             // LockCheckBox
             // 
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CheckedChanged += new System.EventHandler(this.LockCheckBox_CheckedChanged);
             this.ResumeLayout(false);
 

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -239,10 +239,11 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         //Key先发起失去焦点事件，在执行用户自定义的事件
         private void TextBox_KeyDown(object sender, KeyEventArgs e)
         {
-            if (e.KeyCode == Keys.Enter) {
+            if (e.KeyCode == Keys.Enter)
+            {
                 GetData();
             }
-        }   
+        }
 
         public void SetLockCheckBox(CheckBox ctl)
         {
@@ -327,7 +328,8 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         public void TextBox_Leave(object sender, EventArgs e)
         {
             TextBox.BackColor = System.Drawing.Color.White;
-            GetData();
+            if (Enabled)
+                GetData();
         }
 
         private void SearchTextBox_Load(object sender, EventArgs e)

UAS-MES/Form1.Designer.cs

@@ -28,15 +28,13 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
             this.ct_coll = new System.Windows.Forms.DataVisualization.Charting.Chart();
-            this.searchTextBox2 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.searchTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.serialPortCombox1 = new UAS_MES.CustomControl.ComBoxWithFocus.SerialPortCombox();
             this.normalButton3 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.normalButton2 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -74,63 +72,27 @@
             this.ct_coll.BackHatchStyle = System.Windows.Forms.DataVisualization.Charting.ChartHatchStyle.Cross;
             this.ct_coll.BackImageTransparentColor = System.Drawing.SystemColors.Control;
             this.ct_coll.BorderlineColor = System.Drawing.SystemColors.Control;
-            chartArea2.Name = "ChartArea1";
-            this.ct_coll.ChartAreas.Add(chartArea2);
-            legend2.Enabled = false;
-            legend2.Name = "Legend1";
-            this.ct_coll.Legends.Add(legend2);
-            this.ct_coll.Location = new System.Drawing.Point(829, 209);
+            chartArea1.Name = "ChartArea1";
+            this.ct_coll.ChartAreas.Add(chartArea1);
+            legend1.Enabled = false;
+            legend1.Name = "Legend1";
+            this.ct_coll.Legends.Add(legend1);
+            this.ct_coll.Location = new System.Drawing.Point(832, 11);
             this.ct_coll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ct_coll.Name = "ct_coll";
             this.ct_coll.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.None;
-            series2.ChartArea = "ChartArea1";
-            series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
-            series2.IsXValueIndexed = true;
-            series2.Label = "#PERCENT#VALX :#VAL";
-            series2.Legend = "Legend1";
-            series2.LegendText = "#VALX";
-            series2.Name = "Series1";
-            this.ct_coll.Series.Add(series2);
+            series1.ChartArea = "ChartArea1";
+            series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
+            series1.IsXValueIndexed = true;
+            series1.Label = "#PERCENT#VALX :#VAL";
+            series1.Legend = "Legend1";
+            series1.LegendText = "#VALX";
+            series1.Name = "Series1";
+            this.ct_coll.Series.Add(series1);
             this.ct_coll.Size = new System.Drawing.Size(395, 398);
             this.ct_coll.TabIndex = 5;
             this.ct_coll.Text = "chart1";
             // 
-            // searchTextBox2
-            // 
-            this.searchTextBox2.AllPower = null;
-            this.searchTextBox2.Caller = null;
-            this.searchTextBox2.Condition = null;
-            this.searchTextBox2.DBTitle = null;
-            this.searchTextBox2.FormName = null;
-            this.searchTextBox2.Location = new System.Drawing.Point(528, 84);
-            this.searchTextBox2.Margin = new System.Windows.Forms.Padding(4);
-            this.searchTextBox2.Name = "searchTextBox2";
-            this.searchTextBox2.Power = null;
-            this.searchTextBox2.SelectField = null;
-            this.searchTextBox2.SetValueField = null;
-            this.searchTextBox2.Size = new System.Drawing.Size(280, 26);
-            this.searchTextBox2.TabIndex = 14;
-            this.searchTextBox2.TableName = null;
-            this.searchTextBox2.TextBoxEnable = false;
-            // 
-            // searchTextBox1
-            // 
-            this.searchTextBox1.AllPower = null;
-            this.searchTextBox1.Caller = null;
-            this.searchTextBox1.Condition = null;
-            this.searchTextBox1.DBTitle = null;
-            this.searchTextBox1.FormName = null;
-            this.searchTextBox1.Location = new System.Drawing.Point(528, 50);
-            this.searchTextBox1.Margin = new System.Windows.Forms.Padding(4);
-            this.searchTextBox1.Name = "searchTextBox1";
-            this.searchTextBox1.Power = null;
-            this.searchTextBox1.SelectField = null;
-            this.searchTextBox1.SetValueField = null;
-            this.searchTextBox1.Size = new System.Drawing.Size(153, 26);
-            this.searchTextBox1.TabIndex = 13;
-            this.searchTextBox1.TableName = null;
-            this.searchTextBox1.TextBoxEnable = false;
-            // 
             // serialPortCombox1
             // 
             this.serialPortCombox1.Location = new System.Drawing.Point(829, 645);
@@ -220,7 +182,8 @@
             this.enterTextBox2.BackColor = System.Drawing.Color.White;
             this.enterTextBox2.Enabled = false;
             this.enterTextBox2.ID = null;
-            this.enterTextBox2.Location = new System.Drawing.Point(646, 179);
+            this.enterTextBox2.Location = new System.Drawing.Point(598, 184);
+            this.enterTextBox2.Lock = false;
             this.enterTextBox2.Name = "enterTextBox2";
             this.enterTextBox2.Power = null;
             this.enterTextBox2.Size = new System.Drawing.Size(196, 25);
@@ -235,8 +198,6 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1239, 738);
             this.Controls.Add(this.enterTextBox2);
-            this.Controls.Add(this.searchTextBox2);
-            this.Controls.Add(this.searchTextBox1);
             this.Controls.Add(this.serialPortCombox1);
             this.Controls.Add(this.normalButton3);
             this.Controls.Add(this.normalButton2);
@@ -270,8 +231,6 @@
         private CustomControl.ButtonUtil.NormalButton normalButton2;
         private CustomControl.ButtonUtil.NormalButton normalButton3;
         private CustomControl.ComBoxWithFocus.SerialPortCombox serialPortCombox1;
-        private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox1;
-        private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox2;
         private CustomControl.TextBoxWithIcon.MaCodeTextBox enterTextBox2;
     }
 }

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

@@ -70,7 +70,7 @@
             this.ma_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.ComList = new UAS_MES.CustomControl.ComBoxWithFocus.SerialPortCombox();
             this.BaudRate = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
@@ -663,7 +663,7 @@
         private System.Windows.Forms.Label mcd_okqty_label;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.ButtonUtil.NormalButton normalButton1;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox outboxcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox outboxcode;
         private System.Windows.Forms.Panel panel6;
         private CustomControl.ValueLabel.ValueLabel pr_cartongw;
         private CustomControl.ValueLabel.ValueLabel pr_code;

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

@@ -31,11 +31,11 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_CheckNoRelpace));
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.old_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.old_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.old_checkno_label = new System.Windows.Forms.Label();
-            this.new_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.new_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.new_checkno_label = new System.Windows.Forms.Label();
-            this.ReplaceReason = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ReplaceReason = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ms_sncode_label = new System.Windows.Forms.Label();
             this.ReplaceCheckNo = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SuspendLayout();
@@ -201,11 +201,11 @@
 
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ButtonUtil.NormalButton Clean;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox old_sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox old_sncode;
         private System.Windows.Forms.Label old_checkno_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox new_sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox new_sncode;
         private System.Windows.Forms.Label new_checkno_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ReplaceReason;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ReplaceReason;
         private System.Windows.Forms.Label ms_sncode_label;
         private CustomControl.ButtonUtil.NormalButton ReplaceCheckNo;
     }

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

@@ -68,7 +68,7 @@
             this.ma_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.BaudRate_label = new System.Windows.Forms.Label();
             this.BaudRate = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
@@ -641,7 +641,7 @@
         private System.Windows.Forms.Label mcd_okqty_label;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.ButtonUtil.NormalButton normalButton1;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
         private System.Windows.Forms.Label pr_colorboxgw_label;
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label pr_colorboxunit;

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

@@ -46,7 +46,6 @@
             this.ecn_label = new System.Windows.Forms.CheckBox();
             this.ClearSn_code = new System.Windows.Forms.PictureBox();
             this.CleanMa_code = new System.Windows.Forms.PictureBox();
-            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -54,11 +53,13 @@
             this.ma_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.softwareversion = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ecn = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.softwareversion = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ecn = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.LockMakeCode = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
+            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CleanMa_code)).BeginInit();
@@ -70,8 +71,9 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(983, 29);
+            this.panel2.Size = new System.Drawing.Size(1311, 36);
             this.panel2.TabIndex = 31;
             // 
             // label1
@@ -79,9 +81,10 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(12, 3);
+            this.label1.Location = new System.Drawing.Point(16, 4);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.Text = "上料采集";
             // 
@@ -89,9 +92,10 @@
             // 
             this.mcd_restqty_label.AutoSize = true;
             this.mcd_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_restqty_label.Location = new System.Drawing.Point(598, 109);
+            this.mcd_restqty_label.Location = new System.Drawing.Point(797, 136);
+            this.mcd_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_restqty_label.Name = "mcd_restqty_label";
-            this.mcd_restqty_label.Size = new System.Drawing.Size(74, 21);
+            this.mcd_restqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_restqty_label.TabIndex = 59;
             this.mcd_restqty_label.Text = "待采集数";
             // 
@@ -99,9 +103,10 @@
             // 
             this.mcd_inqty_label.AutoSize = true;
             this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty_label.Location = new System.Drawing.Point(321, 109);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(428, 136);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty_label.Name = "mcd_inqty_label";
-            this.mcd_inqty_label.Size = new System.Drawing.Size(74, 21);
+            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_inqty_label.TabIndex = 56;
             this.mcd_inqty_label.Text = "已采集数";
             // 
@@ -109,9 +114,10 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(33, 109);
+            this.ma_qty_label.Location = new System.Drawing.Point(44, 136);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
             this.ma_qty_label.TabIndex = 53;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -119,9 +125,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(33, 59);
+            this.ms_makecode_label.Location = new System.Drawing.Point(44, 74);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 49;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -129,9 +136,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(598, 59);
+            this.pr_detail_label.Location = new System.Drawing.Point(797, 74);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 50;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -139,9 +147,10 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(321, 59);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(428, 74);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_prodcode_label.TabIndex = 51;
             this.ma_prodcode_label.Text = "产品代码";
             // 
@@ -151,9 +160,10 @@
             this.Loading.Checked = true;
             this.Loading.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Loading.ForeColor = System.Drawing.Color.Blue;
-            this.Loading.Location = new System.Drawing.Point(42, 455);
+            this.Loading.Location = new System.Drawing.Point(56, 569);
+            this.Loading.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Loading.Name = "Loading";
-            this.Loading.Size = new System.Drawing.Size(60, 25);
+            this.Loading.Size = new System.Drawing.Size(73, 31);
             this.Loading.TabIndex = 62;
             this.Loading.TabStop = true;
             this.Loading.Text = "上料";
@@ -164,9 +174,10 @@
             this.UnLoading.AutoSize = true;
             this.UnLoading.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.UnLoading.ForeColor = System.Drawing.Color.Blue;
-            this.UnLoading.Location = new System.Drawing.Point(122, 455);
+            this.UnLoading.Location = new System.Drawing.Point(163, 569);
+            this.UnLoading.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.UnLoading.Name = "UnLoading";
-            this.UnLoading.Size = new System.Drawing.Size(60, 25);
+            this.UnLoading.Size = new System.Drawing.Size(73, 31);
             this.UnLoading.TabIndex = 63;
             this.UnLoading.Text = "下料";
             this.UnLoading.UseVisualStyleBackColor = true;
@@ -175,9 +186,10 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(38, 493);
+            this.sn_code_label.Location = new System.Drawing.Point(51, 616);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
+            this.sn_code_label.Size = new System.Drawing.Size(72, 27);
             this.sn_code_label.TabIndex = 64;
             this.sn_code_label.Text = "序列号";
             // 
@@ -185,9 +197,10 @@
             // 
             this.code_label.AutoSize = true;
             this.code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.code_label.Location = new System.Drawing.Point(38, 538);
+            this.code_label.Location = new System.Drawing.Point(51, 672);
+            this.code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.code_label.Name = "code_label";
-            this.code_label.Size = new System.Drawing.Size(58, 21);
+            this.code_label.Size = new System.Drawing.Size(72, 27);
             this.code_label.TabIndex = 66;
             this.code_label.Text = "录入框";
             // 
@@ -195,9 +208,10 @@
             // 
             this.iflastsn.AutoSize = true;
             this.iflastsn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.iflastsn.Location = new System.Drawing.Point(313, 493);
+            this.iflastsn.Location = new System.Drawing.Point(417, 616);
+            this.iflastsn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.iflastsn.Name = "iflastsn";
-            this.iflastsn.Size = new System.Drawing.Size(115, 25);
+            this.iflastsn.Size = new System.Drawing.Size(142, 31);
             this.iflastsn.TabIndex = 72;
             this.iflastsn.Text = "前一工单SN";
             this.iflastsn.UseVisualStyleBackColor = true;
@@ -206,9 +220,10 @@
             // 
             this.softwareversion_label.AutoSize = true;
             this.softwareversion_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.softwareversion_label.Location = new System.Drawing.Point(704, 166);
+            this.softwareversion_label.Location = new System.Drawing.Point(939, 208);
+            this.softwareversion_label.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.softwareversion_label.Name = "softwareversion_label";
-            this.softwareversion_label.Size = new System.Drawing.Size(93, 25);
+            this.softwareversion_label.Size = new System.Drawing.Size(114, 31);
             this.softwareversion_label.TabIndex = 74;
             this.softwareversion_label.Text = "软件版本";
             this.softwareversion_label.UseVisualStyleBackColor = true;
@@ -217,9 +232,10 @@
             // 
             this.ecn_label.AutoSize = true;
             this.ecn_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ecn_label.Location = new System.Drawing.Point(704, 244);
+            this.ecn_label.Location = new System.Drawing.Point(939, 305);
+            this.ecn_label.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ecn_label.Name = "ecn_label";
-            this.ecn_label.Size = new System.Drawing.Size(78, 25);
+            this.ecn_label.Size = new System.Drawing.Size(94, 31);
             this.ecn_label.TabIndex = 75;
             this.ecn_label.Text = "ECN号";
             this.ecn_label.UseVisualStyleBackColor = true;
@@ -228,9 +244,10 @@
             // 
             this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
-            this.ClearSn_code.Location = new System.Drawing.Point(287, 496);
+            this.ClearSn_code.Location = new System.Drawing.Point(383, 620);
+            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ClearSn_code.Name = "ClearSn_code";
-            this.ClearSn_code.Size = new System.Drawing.Size(16, 16);
+            this.ClearSn_code.Size = new System.Drawing.Size(21, 20);
             this.ClearSn_code.TabIndex = 138;
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.ClearSn_code_Click);
@@ -239,57 +256,42 @@
             // 
             this.CleanMa_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.CleanMa_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
-            this.CleanMa_code.Location = new System.Drawing.Point(292, 62);
+            this.CleanMa_code.Location = new System.Drawing.Point(389, 78);
+            this.CleanMa_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.CleanMa_code.Name = "CleanMa_code";
-            this.CleanMa_code.Size = new System.Drawing.Size(16, 16);
+            this.CleanMa_code.Size = new System.Drawing.Size(21, 20);
             this.CleanMa_code.TabIndex = 139;
             this.CleanMa_code.TabStop = false;
             this.CleanMa_code.Click += new System.EventHandler(this.CleanMa_code_Click);
             // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(136, 59);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(152, 21);
-            this.ma_code.TabIndex = 100;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            this.ma_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextChange(this.ma_code_UserControlTextChanged);
-            // 
             // ma_prodcode
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(416, 59);
+            this.ma_prodcode.Location = new System.Drawing.Point(555, 74);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 99;
             // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(698, 59);
+            this.pr_detail.Location = new System.Drawing.Point(931, 74);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 98;
             // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(697, 109);
+            this.mcd_remainqty.Location = new System.Drawing.Point(929, 136);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(0, 21);
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_remainqty.TabIndex = 97;
             this.mcd_remainqty.Tag = "mcd_remainqty";
             // 
@@ -297,26 +299,29 @@
             // 
             this.mcd_inqty.AutoSize = true;
             this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(416, 109);
+            this.mcd_inqty.Location = new System.Drawing.Point(555, 136);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty.Name = "mcd_inqty";
-            this.mcd_inqty.Size = new System.Drawing.Size(0, 21);
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_inqty.TabIndex = 96;
             // 
             // ma_qty
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(136, 109);
+            this.ma_qty.Location = new System.Drawing.Point(181, 136);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 21);
+            this.ma_qty.Size = new System.Drawing.Size(0, 27);
             this.ma_qty.TabIndex = 95;
             // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(37, 146);
+            this.OperateResult.Location = new System.Drawing.Point(49, 182);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(643, 290);
+            this.OperateResult.Size = new System.Drawing.Size(856, 362);
             this.OperateResult.TabIndex = 94;
             this.OperateResult.Text = "";
             // 
@@ -327,12 +332,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(616, 456);
+            this.Clean.Location = new System.Drawing.Point(821, 570);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(60, 24);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 80;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -345,10 +351,11 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.softwareversion.BackColor = System.Drawing.Color.White;
             this.softwareversion.ID = null;
-            this.softwareversion.Location = new System.Drawing.Point(808, 166);
+            this.softwareversion.Location = new System.Drawing.Point(1077, 208);
+            this.softwareversion.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.softwareversion.Name = "softwareversion";
             this.softwareversion.Power = null;
-            this.softwareversion.Size = new System.Drawing.Size(145, 21);
+            this.softwareversion.Size = new System.Drawing.Size(192, 25);
             this.softwareversion.Str = null;
             this.softwareversion.Str1 = null;
             this.softwareversion.Str2 = null;
@@ -361,10 +368,11 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.ecn.BackColor = System.Drawing.Color.White;
             this.ecn.ID = null;
-            this.ecn.Location = new System.Drawing.Point(808, 244);
+            this.ecn.Location = new System.Drawing.Point(1077, 305);
+            this.ecn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ecn.Name = "ecn";
             this.ecn.Power = null;
-            this.ecn.Size = new System.Drawing.Size(145, 21);
+            this.ecn.Size = new System.Drawing.Size(192, 25);
             this.ecn.Str = null;
             this.ecn.Str1 = null;
             this.ecn.Str2 = null;
@@ -377,12 +385,13 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(313, 535);
+            this.Confirm.Location = new System.Drawing.Point(417, 669);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(60, 24);
+            this.Confirm.Size = new System.Drawing.Size(80, 30);
             this.Confirm.TabIndex = 73;
             this.Confirm.Tag = "IfWrite";
             this.Confirm.Text = "确认";
@@ -394,10 +403,11 @@
             this.code.AllPower = "ifall";
             this.code.BackColor = System.Drawing.Color.White;
             this.code.ID = null;
-            this.code.Location = new System.Drawing.Point(122, 538);
+            this.code.Location = new System.Drawing.Point(163, 672);
+            this.code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.code.Name = "code";
             this.code.Power = null;
-            this.code.Size = new System.Drawing.Size(160, 21);
+            this.code.Size = new System.Drawing.Size(212, 25);
             this.code.Str = null;
             this.code.Str1 = null;
             this.code.Str2 = null;
@@ -411,23 +421,54 @@
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.Enabled = false;
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(122, 493);
+            this.sn_code.Location = new System.Drawing.Point(163, 616);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(160, 21);
+            this.sn_code.Size = new System.Drawing.Size(212, 25);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
             this.sn_code.TabIndex = 65;
             // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.Location = new System.Drawing.Point(181, 43);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(91, 24);
+            this.LockMakeCode.TabIndex = 140;
+            this.LockMakeCode.Text = "锁定工单";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(181, 76);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(194, 25);
+            this.ma_code.TabIndex = 141;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
             // Make_FeedingCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(983, 568);
+            this.ClientSize = new System.Drawing.Size(1311, 710);
+            this.Controls.Add(this.ma_code);
+            this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.CleanMa_code);
             this.Controls.Add(this.ClearSn_code);
-            this.Controls.Add(this.ma_code);
             this.Controls.Add(this.ma_prodcode);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.mcd_remainqty);
@@ -455,6 +496,7 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.Controls.Add(this.panel2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_FeedingCollection";
             this.Tag = "Make!FeedingCollection";
             this.Text = "上料采集";
@@ -481,16 +523,16 @@
         private System.Windows.Forms.Label ma_prodcode_label;
         private System.Windows.Forms.RadioButton Loading;
         private System.Windows.Forms.RadioButton UnLoading;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox sn_code;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
         private System.Windows.Forms.Label sn_code_label;
         private System.Windows.Forms.Label code_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox code;
+        private CustomControl.TextBoxWithIcon.EnterTextBox code;
         private System.Windows.Forms.CheckBox iflastsn;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private System.Windows.Forms.CheckBox softwareversion_label;
         private System.Windows.Forms.CheckBox ecn_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ecn;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox softwareversion;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ecn;
+        private CustomControl.TextBoxWithIcon.EnterTextBox softwareversion;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ValueLabel.ValueLabel ma_qty;
@@ -498,8 +540,9 @@
         private CustomControl.ValueLabel.ValueLabel mcd_remainqty;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
-        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
         private System.Windows.Forms.PictureBox ClearSn_code;
         private System.Windows.Forms.PictureBox CleanMa_code;
+        private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
+        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
     }
 }

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -56,6 +56,10 @@ namespace UAS_MES.Make
             dh = new DataHelper();
             code.Focus();
             asc.controllInitializeSize(this);
+
+            LockMakeCode.GetMakeCodeCtl(ma_code);
+            ma_code.SetLockCheckBox(LockMakeCode);
+
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,pr_detail # 产品名称";

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

@@ -46,7 +46,7 @@
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.SuspendLayout();
             // 
@@ -54,7 +54,7 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(44, 28);
+            this.ms_makecode_label.Location = new System.Drawing.Point(44, 51);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
@@ -65,7 +65,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(336, 28);
+            this.pr_code_label.Location = new System.Drawing.Point(336, 51);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(92, 27);
@@ -76,7 +76,7 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(44, 89);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(44, 112);
             this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
             this.mcd_okqty_label.Size = new System.Drawing.Size(92, 27);
@@ -87,7 +87,7 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(336, 89);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(336, 112);
             this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
             this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
@@ -98,7 +98,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(628, 89);
+            this.label4.Location = new System.Drawing.Point(628, 112);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(92, 27);
@@ -122,7 +122,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(628, 28);
+            this.pr_detail_label.Location = new System.Drawing.Point(628, 51);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -133,7 +133,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(993, 89);
+            this.label1.Location = new System.Drawing.Point(993, 112);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(52, 27);
@@ -144,7 +144,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(993, 26);
+            this.label2.Location = new System.Drawing.Point(993, 49);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(72, 27);
@@ -155,7 +155,7 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1096, 89);
+            this.PrintLabel.Location = new System.Drawing.Point(1096, 112);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(201, 23);
@@ -163,7 +163,7 @@
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1096, 26);
+            this.Printer.Location = new System.Drawing.Point(1096, 49);
             this.Printer.Margin = new System.Windows.Forms.Padding(5);
             this.Printer.Name = "Printer";
             this.Printer.Size = new System.Drawing.Size(203, 31);
@@ -173,7 +173,7 @@
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(463, 89);
+            this.mcd_remainqty.Location = new System.Drawing.Point(463, 112);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
@@ -184,7 +184,7 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(169, 89);
+            this.mcd_okqty.Location = new System.Drawing.Point(169, 112);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
             this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
@@ -195,7 +195,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(463, 28);
+            this.pr_code.Location = new System.Drawing.Point(463, 51);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.Name = "pr_code";
             this.pr_code.Size = new System.Drawing.Size(0, 27);
@@ -206,7 +206,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(757, 28);
+            this.pr_detail.Location = new System.Drawing.Point(757, 51);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -216,7 +216,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(169, 28);
+            this.ms_makecode.Location = new System.Drawing.Point(169, 51);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.Name = "ms_makecode";
             this.ms_makecode.Size = new System.Drawing.Size(0, 27);
@@ -227,7 +227,7 @@
             this.PrintNum.AllPower = null;
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(755, 89);
+            this.PrintNum.Location = new System.Drawing.Point(755, 112);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
@@ -260,14 +260,14 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(49, 144);
+            this.OperateResult.Location = new System.Drawing.Point(49, 163);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(940, 399);
+            this.OperateResult.Size = new System.Drawing.Size(940, 380);
             this.OperateResult.TabIndex = 143;
             this.OperateResult.Text = "";
             // 
-            // 标签打印
+            // Make_LabelPrint
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -293,7 +293,7 @@
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(4);
-            this.Name = "标签打印";
+            this.Name = "Make_LabelPrint";
             this.Text = "标签打印";
             this.Activated += new System.EventHandler(this.标签打印_Activated);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.标签打印_FormClosing);
@@ -311,7 +311,7 @@
         private System.Windows.Forms.Label mcd_remainqty_label;
         private System.Windows.Forms.Label label4;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
         private System.Windows.Forms.Label sncode_label;
         private System.Windows.Forms.Label pr_detail_label;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox PrintNum;

UAS-MES/FunctionCode/Make/Make_LabelPrint.cs

@@ -86,7 +86,7 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>切换工单至工单号" + ma_code + "\n", Color.Red);
                     }
                     sql.Clear();
-                    sql.Append("select ms_makecode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as mcd_remainqty,pr_detail,pr_code ");
+                    sql.Append("select ma_code,mcd_okqty,ma_qty,ma_qty-mcd_inqty as mcd_remainqty,pr_detail,pr_code ");
                     sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
                     sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_sncode=:sncode");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", sncode.Text);
@@ -105,7 +105,7 @@ namespace UAS_MES.Make
                     if (Step == "Loading")
                     {
                         sql.Clear();
-                        sql.Append("select ms_makecode ,ma_craftcode,ms_nextstepcode, ms_status,ms_stepcode from makeserial ");
+                        sql.Append("select ma_code,ma_craftcode,ms_nextstepcode, ms_status,ms_stepcode from makeserial ");
                         sql.Append("left join make on ma_code=ms_makecode where ms_sncode=:sncode or ms_psn=:sncode");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", sncode.Text, sncode.Text);
                         //记录一些变量
@@ -245,9 +245,7 @@ namespace UAS_MES.Make
                 }
             }
             else
-            {
                 MessageBox.Show(ErrorMessage1);
-            }
         }
 
         private void 标签打印_Activated(object sender, EventArgs e)

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

@@ -32,21 +32,22 @@
             this.pr_code_label = new System.Windows.Forms.Label();
             this.pa_packageqty_label = new System.Windows.Forms.Label();
             this.pa_outboxcode_label = new System.Windows.Forms.Label();
+            this.title = new System.Windows.Forms.Label();
+            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode();
             this.headBar1 = new UAS_MES.CustomControl.HeadBar();
             this.pa_packageqty = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.pr_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.title = new System.Windows.Forms.Label();
-            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode();
             this.SuspendLayout();
             // 
             // pr_code_label
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(19, 60);
+            this.pr_code_label.Location = new System.Drawing.Point(25, 75);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 0;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -54,9 +55,10 @@
             // 
             this.pa_packageqty_label.AutoSize = true;
             this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty_label.Location = new System.Drawing.Point(19, 105);
+            this.pa_packageqty_label.Location = new System.Drawing.Point(25, 131);
+            this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_packageqty_label.Name = "pa_packageqty_label";
-            this.pa_packageqty_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_packageqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_packageqty_label.TabIndex = 1;
             this.pa_packageqty_label.Text = "箱内数量";
             // 
@@ -64,20 +66,43 @@
             // 
             this.pa_outboxcode_label.AutoSize = true;
             this.pa_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode_label.Location = new System.Drawing.Point(19, 151);
+            this.pa_outboxcode_label.Location = new System.Drawing.Point(25, 189);
+            this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
-            this.pa_outboxcode_label.Size = new System.Drawing.Size(42, 21);
+            this.pa_outboxcode_label.Size = new System.Drawing.Size(52, 27);
             this.pa_outboxcode_label.TabIndex = 2;
             this.pa_outboxcode_label.Text = "箱号";
             // 
+            // title
+            // 
+            this.title.AutoSize = true;
+            this.title.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.title.ForeColor = System.Drawing.SystemColors.ButtonFace;
+            this.title.Location = new System.Drawing.Point(9, 8);
+            this.title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.title.Name = "title";
+            this.title.Size = new System.Drawing.Size(0, 27);
+            this.title.TabIndex = 9;
+            // 
+            // pa_outboxcode
+            // 
+            this.pa_outboxcode.ErrorMsg = null;
+            this.pa_outboxcode.Location = new System.Drawing.Point(128, 189);
+            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pa_outboxcode.Name = "pa_outboxcode";
+            this.pa_outboxcode.Pr_id = null;
+            this.pa_outboxcode.Size = new System.Drawing.Size(206, 26);
+            this.pa_outboxcode.TabIndex = 10;
+            // 
             // headBar1
             // 
             this.headBar1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
             this.headBar1.Location = new System.Drawing.Point(0, 0);
-            this.headBar1.Margin = new System.Windows.Forms.Padding(4);
+            this.headBar1.Margin = new System.Windows.Forms.Padding(5);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(299, 32);
+            this.headBar1.Size = new System.Drawing.Size(399, 40);
             this.headBar1.TabIndex = 7;
             // 
             // pa_packageqty
@@ -85,11 +110,12 @@
             this.pa_packageqty.AllPower = null;
             this.pa_packageqty.BackColor = System.Drawing.Color.White;
             this.pa_packageqty.ID = null;
-            this.pa_packageqty.Location = new System.Drawing.Point(96, 105);
+            this.pa_packageqty.Location = new System.Drawing.Point(128, 131);
+            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4);
             this.pa_packageqty.Name = "pa_packageqty";
             this.pa_packageqty.Negative = false;
             this.pa_packageqty.Power = null;
-            this.pa_packageqty.Size = new System.Drawing.Size(177, 21);
+            this.pa_packageqty.Size = new System.Drawing.Size(206, 25);
             this.pa_packageqty.Str = null;
             this.pa_packageqty.Str1 = null;
             this.pa_packageqty.Str2 = null;
@@ -102,12 +128,13 @@
             this.pr_code.Condition = null;
             this.pr_code.DBTitle = "产品编号查询";
             this.pr_code.FormName = null;
-            this.pr_code.Location = new System.Drawing.Point(96, 60);
+            this.pr_code.Location = new System.Drawing.Point(128, 75);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(4);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = "ifread";
             this.pr_code.SelectField = null;
             this.pr_code.SetValueField = null;
-            this.pr_code.Size = new System.Drawing.Size(177, 21);
+            this.pr_code.Size = new System.Drawing.Size(206, 26);
             this.pr_code.TabIndex = 4;
             this.pr_code.TableName = null;
             this.pr_code.TextBoxEnable = false;
@@ -120,43 +147,24 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(123, 189);
+            this.Confirm.Location = new System.Drawing.Point(164, 236);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(53, 23);
+            this.Confirm.Size = new System.Drawing.Size(71, 29);
             this.Confirm.TabIndex = 3;
             this.Confirm.Tag = "Make!NewPallet";
             this.Confirm.Text = "确认";
             this.Confirm.UseVisualStyleBackColor = true;
             this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
             // 
-            // title
-            // 
-            this.title.AutoSize = true;
-            this.title.BackColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.title.ForeColor = System.Drawing.SystemColors.ButtonFace;
-            this.title.Location = new System.Drawing.Point(7, 6);
-            this.title.Name = "title";
-            this.title.Size = new System.Drawing.Size(0, 21);
-            this.title.TabIndex = 9;
-            // 
-            // pa_outboxcode
-            // 
-            this.pa_outboxcode.ErrorMsg = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(95, 151);
-            this.pa_outboxcode.Name = "pa_outboxcode";
-            this.pa_outboxcode.Pr_id = null;
-            this.pa_outboxcode.Size = new System.Drawing.Size(178, 21);
-            this.pa_outboxcode.TabIndex = 10;
-            // 
             // Make_NewPallet
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(299, 224);
+            this.ClientSize = new System.Drawing.Size(399, 280);
             this.Controls.Add(this.pa_outboxcode);
             this.Controls.Add(this.title);
             this.Controls.Add(this.headBar1);
@@ -167,6 +175,7 @@
             this.Controls.Add(this.pa_packageqty_label);
             this.Controls.Add(this.pr_code_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_NewPallet";
             this.Tag = "ShowDialogWindow";
             this.Text = "新增栈板";

UAS-MES/FunctionCode/Make/Make_NewPallet.cs

@@ -6,7 +6,6 @@ namespace UAS_MES.Make
 {
     public partial class Make_NewPallet : Form
     {
-
         DataHelper dh;
         //生成的箱类型，2表示大箱号，3表示栈板号
         string pa_type = "";

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

@@ -55,12 +55,12 @@
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.Printing = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pa_packageqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.pa_totalqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ma_prodname = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.pa_restqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.barcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pa_packageqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pa_totalqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_prodname = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pa_restqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.barcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.PackageDetail = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pa_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -76,9 +76,10 @@
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Enabled = false;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(525, 53);
+            this.pr_code_label.Location = new System.Drawing.Point(700, 66);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 81;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -86,9 +87,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(20, 102);
+            this.pr_detail_label.Location = new System.Drawing.Point(27, 128);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 80;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -96,9 +98,10 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(283, 54);
+            this.ma_code_label.Location = new System.Drawing.Point(377, 68);
+            this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(58, 21);
+            this.ma_code_label.Size = new System.Drawing.Size(72, 27);
             this.ma_code_label.TabIndex = 76;
             this.ma_code_label.Text = "工单号";
             // 
@@ -108,8 +111,9 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1019, 29);
+            this.panel2.Size = new System.Drawing.Size(1359, 36);
             this.panel2.TabIndex = 88;
             this.panel2.Tag = "NoAuto";
             // 
@@ -118,9 +122,10 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(12, 4);
+            this.label1.Location = new System.Drawing.Point(16, 5);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.Text = "基础信息";
             // 
@@ -128,9 +133,10 @@
             // 
             this.pa_packageqty_label.AutoSize = true;
             this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty_label.Location = new System.Drawing.Point(268, 102);
+            this.pa_packageqty_label.Location = new System.Drawing.Point(357, 128);
+            this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_packageqty_label.Name = "pa_packageqty_label";
-            this.pa_packageqty_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_packageqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_packageqty_label.TabIndex = 95;
             this.pa_packageqty_label.Text = "已装数量";
             // 
@@ -138,9 +144,10 @@
             // 
             this.pa_totalqty_label.AutoSize = true;
             this.pa_totalqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty_label.Location = new System.Drawing.Point(269, 149);
+            this.pa_totalqty_label.Location = new System.Drawing.Point(359, 186);
+            this.pa_totalqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_totalqty_label.Name = "pa_totalqty_label";
-            this.pa_totalqty_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_totalqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_totalqty_label.TabIndex = 97;
             this.pa_totalqty_label.Text = "箱内容量";
             // 
@@ -149,9 +156,10 @@
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label13.ForeColor = System.Drawing.Color.Black;
-            this.label13.Location = new System.Drawing.Point(20, 572);
+            this.label13.Location = new System.Drawing.Point(27, 715);
+            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(58, 21);
+            this.label13.Size = new System.Drawing.Size(72, 27);
             this.label13.TabIndex = 105;
             this.label13.Text = "序列号";
             // 
@@ -159,9 +167,10 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(52, 53);
+            this.pa_code_label.Location = new System.Drawing.Point(69, 66);
+            this.pa_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_code_label.Name = "pa_code_label";
-            this.pa_code_label.Size = new System.Drawing.Size(42, 21);
+            this.pa_code_label.Size = new System.Drawing.Size(52, 27);
             this.pa_code_label.TabIndex = 113;
             this.pa_code_label.Text = "箱号";
             // 
@@ -169,9 +178,10 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(7, 149);
+            this.PrintList_label.Location = new System.Drawing.Point(9, 186);
+            this.PrintList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintList_label.Name = "PrintList_label";
-            this.PrintList_label.Size = new System.Drawing.Size(90, 21);
+            this.PrintList_label.Size = new System.Drawing.Size(112, 27);
             this.PrintList_label.TabIndex = 116;
             this.PrintList_label.Text = "打印机列表";
             // 
@@ -179,9 +189,10 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(782, 149);
+            this.PrintNum_label.Location = new System.Drawing.Point(1043, 186);
+            this.PrintNum_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintNum_label.Name = "PrintNum_label";
-            this.PrintNum_label.Size = new System.Drawing.Size(42, 21);
+            this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
             this.PrintNum_label.TabIndex = 124;
             this.PrintNum_label.Text = "份数";
             // 
@@ -189,9 +200,10 @@
             // 
             this.pa_restqty_label.AutoSize = true;
             this.pa_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_restqty_label.Location = new System.Drawing.Point(525, 102);
+            this.pa_restqty_label.Location = new System.Drawing.Point(700, 128);
+            this.pa_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_restqty_label.Name = "pa_restqty_label";
-            this.pa_restqty_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_restqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_restqty_label.TabIndex = 126;
             this.pa_restqty_label.Text = "剩余容量";
             // 
@@ -199,9 +211,10 @@
             // 
             this.AutoPrint.AutoSize = true;
             this.AutoPrint.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoPrint.Location = new System.Drawing.Point(786, 102);
+            this.AutoPrint.Location = new System.Drawing.Point(1048, 128);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(125, 25);
+            this.AutoPrint.Size = new System.Drawing.Size(154, 31);
             this.AutoPrint.TabIndex = 128;
             this.AutoPrint.Text = "满箱自动打印";
             this.AutoPrint.UseVisualStyleBackColor = true;
@@ -210,9 +223,10 @@
             // 
             this.Cancel.AutoSize = true;
             this.Cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Cancel.Location = new System.Drawing.Point(322, 572);
+            this.Cancel.Location = new System.Drawing.Point(429, 715);
+            this.Cancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Cancel.Name = "Cancel";
-            this.Cancel.Size = new System.Drawing.Size(93, 25);
+            this.Cancel.Size = new System.Drawing.Size(114, 31);
             this.Cancel.TabIndex = 129;
             this.Cancel.Text = "取消采集";
             this.Cancel.UseVisualStyleBackColor = true;
@@ -221,9 +235,10 @@
             // 
             this.pa_id.AutoSize = true;
             this.pa_id.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_id.Location = new System.Drawing.Point(964, 46);
+            this.pa_id.Location = new System.Drawing.Point(1285, 58);
+            this.pa_id.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_id.Name = "pa_id";
-            this.pa_id.Size = new System.Drawing.Size(50, 21);
+            this.pa_id.Size = new System.Drawing.Size(63, 27);
             this.pa_id.TabIndex = 153;
             this.pa_id.Text = "pa_id";
             this.pa_id.Visible = false;
@@ -232,19 +247,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(611, 149);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2);
+            this.PrintLabel.Location = new System.Drawing.Point(815, 186);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(150, 20);
+            this.PrintLabel.Size = new System.Drawing.Size(199, 23);
             this.PrintLabel.TabIndex = 159;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(525, 149);
+            this.label3.Location = new System.Drawing.Point(700, 186);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.TabIndex = 160;
             this.label3.Text = "打印标签";
             // 
@@ -252,9 +268,10 @@
             // 
             this.pr_id.AutoSize = true;
             this.pr_id.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_id.Location = new System.Drawing.Point(964, 71);
+            this.pr_id.Location = new System.Drawing.Point(1285, 89);
+            this.pr_id.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_id.Name = "pr_id";
-            this.pr_id.Size = new System.Drawing.Size(47, 21);
+            this.pr_id.Size = new System.Drawing.Size(60, 27);
             this.pr_id.TabIndex = 161;
             this.pr_id.Tag = "pr_id";
             this.pr_id.Text = "pr_id";
@@ -266,27 +283,29 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(20, 188);
+            this.label2.Location = new System.Drawing.Point(27, 235);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 162;
             this.label2.Text = "装箱信息";
             // 
             // pa_code
             // 
             this.pa_code.ErrorMsg = null;
-            this.pa_code.Location = new System.Drawing.Point(108, 54);
+            this.pa_code.Location = new System.Drawing.Point(144, 68);
+            this.pa_code.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.pa_code.Name = "pa_code";
             this.pa_code.Pr_id = null;
-            this.pa_code.Size = new System.Drawing.Size(149, 21);
+            this.pa_code.Size = new System.Drawing.Size(199, 26);
             this.pa_code.TabIndex = 163;
             // 
             // PrintList
             // 
-            this.PrintList.Location = new System.Drawing.Point(108, 149);
-            this.PrintList.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintList.Location = new System.Drawing.Point(144, 186);
+            this.PrintList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.PrintList.Name = "PrintList";
-            this.PrintList.Size = new System.Drawing.Size(150, 25);
+            this.PrintList.Size = new System.Drawing.Size(200, 31);
             this.PrintList.TabIndex = 158;
             // 
             // PrintNum
@@ -294,11 +313,12 @@
             this.PrintNum.AllPower = null;
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(829, 149);
+            this.PrintNum.Location = new System.Drawing.Point(1105, 186);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(40, 21);
+            this.PrintNum.Size = new System.Drawing.Size(52, 25);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -307,9 +327,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(777, 214);
+            this.OperateResult.Location = new System.Drawing.Point(1036, 268);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(219, 344);
+            this.OperateResult.Size = new System.Drawing.Size(291, 429);
             this.OperateResult.TabIndex = 155;
             this.OperateResult.Text = "";
             // 
@@ -321,12 +342,13 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = "工单查询";
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(351, 54);
+            this.ma_code.Location = new System.Drawing.Point(468, 68);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(150, 21);
+            this.ma_code.Size = new System.Drawing.Size(200, 26);
             this.ma_code.TabIndex = 152;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -340,12 +362,13 @@
             this.Printing.DownImage = ((System.Drawing.Image)(resources.GetObject("Printing.DownImage")));
             this.Printing.Image = ((System.Drawing.Image)(resources.GetObject("Printing.Image")));
             this.Printing.IsShowBorder = true;
-            this.Printing.Location = new System.Drawing.Point(887, 149);
+            this.Printing.Location = new System.Drawing.Point(1183, 186);
+            this.Printing.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Printing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printing.MoveImage")));
             this.Printing.Name = "Printing";
             this.Printing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printing.NormalImage")));
             this.Printing.Power = null;
-            this.Printing.Size = new System.Drawing.Size(60, 24);
+            this.Printing.Size = new System.Drawing.Size(80, 30);
             this.Printing.TabIndex = 150;
             this.Printing.Tag = "ifread";
             this.Printing.Text = "打印";
@@ -359,12 +382,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(856, 571);
+            this.Clean.Location = new System.Drawing.Point(1141, 714);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(60, 24);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 148;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -376,10 +400,11 @@
             this.pa_packageqty.BackColor = System.Drawing.Color.White;
             this.pa_packageqty.Enabled = false;
             this.pa_packageqty.ID = null;
-            this.pa_packageqty.Location = new System.Drawing.Point(351, 102);
+            this.pa_packageqty.Location = new System.Drawing.Point(468, 128);
+            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pa_packageqty.Name = "pa_packageqty";
             this.pa_packageqty.Power = null;
-            this.pa_packageqty.Size = new System.Drawing.Size(150, 21);
+            this.pa_packageqty.Size = new System.Drawing.Size(199, 25);
             this.pa_packageqty.Str = null;
             this.pa_packageqty.Str1 = null;
             this.pa_packageqty.Str2 = null;
@@ -393,10 +418,11 @@
             this.ma_prodcode.BackColor = System.Drawing.Color.White;
             this.ma_prodcode.Enabled = false;
             this.ma_prodcode.ID = null;
-            this.ma_prodcode.Location = new System.Drawing.Point(613, 55);
+            this.ma_prodcode.Location = new System.Drawing.Point(817, 69);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Power = null;
-            this.ma_prodcode.Size = new System.Drawing.Size(150, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(199, 25);
             this.ma_prodcode.Str = null;
             this.ma_prodcode.Str1 = null;
             this.ma_prodcode.Str2 = null;
@@ -409,10 +435,11 @@
             this.pa_totalqty.AllPower = null;
             this.pa_totalqty.BackColor = System.Drawing.Color.White;
             this.pa_totalqty.ID = null;
-            this.pa_totalqty.Location = new System.Drawing.Point(352, 149);
+            this.pa_totalqty.Location = new System.Drawing.Point(469, 186);
+            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pa_totalqty.Name = "pa_totalqty";
             this.pa_totalqty.Power = null;
-            this.pa_totalqty.Size = new System.Drawing.Size(150, 21);
+            this.pa_totalqty.Size = new System.Drawing.Size(199, 25);
             this.pa_totalqty.Str = null;
             this.pa_totalqty.Str1 = null;
             this.pa_totalqty.Str2 = null;
@@ -425,10 +452,11 @@
             this.ma_prodname.BackColor = System.Drawing.Color.White;
             this.ma_prodname.Enabled = false;
             this.ma_prodname.ID = null;
-            this.ma_prodname.Location = new System.Drawing.Point(108, 102);
+            this.ma_prodname.Location = new System.Drawing.Point(144, 128);
+            this.ma_prodname.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ma_prodname.Name = "ma_prodname";
             this.ma_prodname.Power = null;
-            this.ma_prodname.Size = new System.Drawing.Size(150, 21);
+            this.ma_prodname.Size = new System.Drawing.Size(199, 25);
             this.ma_prodname.Str = null;
             this.ma_prodname.Str1 = null;
             this.ma_prodname.Str2 = null;
@@ -441,10 +469,11 @@
             this.pa_restqty.BackColor = System.Drawing.Color.White;
             this.pa_restqty.Enabled = false;
             this.pa_restqty.ID = null;
-            this.pa_restqty.Location = new System.Drawing.Point(611, 102);
+            this.pa_restqty.Location = new System.Drawing.Point(815, 128);
+            this.pa_restqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pa_restqty.Name = "pa_restqty";
             this.pa_restqty.Power = null;
-            this.pa_restqty.Size = new System.Drawing.Size(150, 21);
+            this.pa_restqty.Size = new System.Drawing.Size(199, 25);
             this.pa_restqty.Str = null;
             this.pa_restqty.Str1 = null;
             this.pa_restqty.Str2 = null;
@@ -456,10 +485,11 @@
             this.barcode.AllPower = "ifall";
             this.barcode.BackColor = System.Drawing.Color.White;
             this.barcode.ID = null;
-            this.barcode.Location = new System.Drawing.Point(88, 572);
+            this.barcode.Location = new System.Drawing.Point(117, 715);
+            this.barcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.barcode.Name = "barcode";
             this.barcode.Power = "ifwrite";
-            this.barcode.Size = new System.Drawing.Size(196, 21);
+            this.barcode.Size = new System.Drawing.Size(260, 25);
             this.barcode.Str = null;
             this.barcode.Str1 = null;
             this.barcode.Str2 = null;
@@ -479,11 +509,12 @@
             this.pd_innerqty,
             this.pa_indate,
             this.pd_id});
-            this.PackageDetail.Location = new System.Drawing.Point(23, 214);
+            this.PackageDetail.Location = new System.Drawing.Point(31, 268);
+            this.PackageDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PackageDetail.Name = "PackageDetail";
             this.PackageDetail.ReadOnly = true;
             this.PackageDetail.RowTemplate.Height = 23;
-            this.PackageDetail.Size = new System.Drawing.Size(739, 344);
+            this.PackageDetail.Size = new System.Drawing.Size(985, 430);
             this.PackageDetail.TabIndex = 134;
             // 
             // pd_barcode
@@ -530,11 +561,11 @@
             // 
             // Make_PackageCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSize = true;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.ClientSize = new System.Drawing.Size(1019, 608);
+            this.ClientSize = new System.Drawing.Size(1359, 760);
             this.Controls.Add(this.pa_code);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.pr_id);
@@ -568,6 +599,7 @@
             this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.ma_code_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_PackageCollection";
             this.Tag = "Make!PackageCollection";
             this.Text = "包装采集";
@@ -600,12 +632,12 @@
         private System.Windows.Forms.CheckBox Cancel;
   
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum PackageDetail;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox barcode;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_restqty;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_prodname;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_totalqty;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_prodcode;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_packageqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox barcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_restqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ma_prodname;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_totalqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ma_prodcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_packageqty;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.ButtonUtil.NormalButton Printing;
         private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;

UAS-MES/FunctionCode/Make/Make_PackageCollection.resx

@@ -395,19 +395,4 @@
   <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pd_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

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

@@ -42,8 +42,8 @@
             this.pa_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.palletcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.palletcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SearchPallet = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Print = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ReleasePallet = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -55,7 +55,7 @@
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pa_restqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pa_restqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.pa_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -550,7 +550,7 @@
         private CustomControl.ValueLabel.ValueLabel pa_makecode;
         private System.Windows.Forms.Label pa_makecode_label;
         private System.Windows.Forms.CheckBox AutoPrint;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_restqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_restqty;
         private System.Windows.Forms.Label pa_restqty_label;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum PackageInf;
         private CustomControl.ValueLabel.ValueLabel pa_custcode;
@@ -559,8 +559,8 @@
         private CustomControl.ButtonUtil.NormalButton ReleasePallet;
         private CustomControl.ButtonUtil.NormalButton Print;
         private CustomControl.ButtonUtil.NormalButton SearchPallet;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox palletcode;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox outboxcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox palletcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox outboxcode;
         private System.Windows.Forms.Label palletcode_label;
         private System.Windows.Forms.Label outboxcode_label;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;

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

@@ -43,7 +43,7 @@
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pr_batchnum = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pr_batchnum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.BatchProduct = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -69,8 +69,9 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1079, 29);
+            this.panel2.Size = new System.Drawing.Size(1439, 36);
             this.panel2.TabIndex = 31;
             // 
             // label1
@@ -78,9 +79,10 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(12, 4);
+            this.label1.Location = new System.Drawing.Point(16, 5);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.Text = "岗位备料";
             // 
@@ -88,9 +90,10 @@
             // 
             this.sc_stepcode_label.AutoSize = true;
             this.sc_stepcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sc_stepcode_label.Location = new System.Drawing.Point(643, 94);
+            this.sc_stepcode_label.Location = new System.Drawing.Point(857, 118);
+            this.sc_stepcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sc_stepcode_label.Name = "sc_stepcode_label";
-            this.sc_stepcode_label.Size = new System.Drawing.Size(42, 21);
+            this.sc_stepcode_label.Size = new System.Drawing.Size(52, 27);
             this.sc_stepcode_label.TabIndex = 165;
             this.sc_stepcode_label.Text = "工序";
             // 
@@ -98,9 +101,10 @@
             // 
             this.ma_craftcode_label.AutoSize = true;
             this.ma_craftcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_craftcode_label.Location = new System.Drawing.Point(10, 94);
+            this.ma_craftcode_label.Location = new System.Drawing.Point(13, 118);
+            this.ma_craftcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_craftcode_label.Name = "ma_craftcode_label";
-            this.ma_craftcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_craftcode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_craftcode_label.TabIndex = 162;
             this.ma_craftcode_label.Text = "工艺路线";
             // 
@@ -108,9 +112,10 @@
             // 
             this.sc_linecode_label.AutoSize = true;
             this.sc_linecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sc_linecode_label.Location = new System.Drawing.Point(324, 94);
+            this.sc_linecode_label.Location = new System.Drawing.Point(432, 118);
+            this.sc_linecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sc_linecode_label.Name = "sc_linecode_label";
-            this.sc_linecode_label.Size = new System.Drawing.Size(42, 21);
+            this.sc_linecode_label.Size = new System.Drawing.Size(52, 27);
             this.sc_linecode_label.TabIndex = 159;
             this.sc_linecode_label.Text = "线别";
             // 
@@ -118,9 +123,10 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(10, 50);
+            this.ma_code_label.Location = new System.Drawing.Point(13, 72);
+            this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_code_label.Size = new System.Drawing.Size(92, 27);
             this.ma_code_label.TabIndex = 155;
             this.ma_code_label.Text = "归属工单";
             // 
@@ -128,9 +134,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(643, 50);
+            this.pr_detail_label.Location = new System.Drawing.Point(857, 72);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 156;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -138,9 +145,10 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(324, 50);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(432, 72);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_prodcode_label.TabIndex = 157;
             this.ma_prodcode_label.Text = "产品代码";
             // 
@@ -150,9 +158,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(12, 527);
+            this.label3.Location = new System.Drawing.Point(16, 659);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.TabIndex = 175;
             this.label3.Text = "物料批号";
             // 
@@ -161,9 +170,10 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(10, 132);
+            this.label2.Location = new System.Drawing.Point(13, 165);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(90, 21);
+            this.label2.Size = new System.Drawing.Size(112, 27);
             this.label2.TabIndex = 181;
             this.label2.Text = "批物料管控";
             // 
@@ -174,13 +184,13 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(112, 54);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ma_code.Location = new System.Drawing.Point(149, 72);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(171, 19);
+            this.ma_code.Size = new System.Drawing.Size(228, 25);
             this.ma_code.TabIndex = 180;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -194,12 +204,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(928, 523);
+            this.Clean.Location = new System.Drawing.Point(1237, 654);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(60, 24);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 179;
             this.Clean.Tag = "IfRead";
             this.Clean.Text = "清除";
@@ -209,9 +220,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(840, 158);
+            this.OperateResult.Location = new System.Drawing.Point(1120, 198);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(234, 353);
+            this.OperateResult.Size = new System.Drawing.Size(311, 440);
             this.OperateResult.TabIndex = 178;
             this.OperateResult.Text = "";
             // 
@@ -222,12 +234,13 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(346, 524);
+            this.Confirm.Location = new System.Drawing.Point(461, 655);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(60, 24);
+            this.Confirm.Size = new System.Drawing.Size(80, 30);
             this.Confirm.TabIndex = 177;
             this.Confirm.Tag = "IfRead";
             this.Confirm.Text = "确认";
@@ -241,10 +254,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.pr_batchnum.BackColor = System.Drawing.Color.White;
             this.pr_batchnum.ID = null;
-            this.pr_batchnum.Location = new System.Drawing.Point(88, 527);
+            this.pr_batchnum.Location = new System.Drawing.Point(117, 659);
+            this.pr_batchnum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pr_batchnum.Name = "pr_batchnum";
             this.pr_batchnum.Power = null;
-            this.pr_batchnum.Size = new System.Drawing.Size(241, 21);
+            this.pr_batchnum.Size = new System.Drawing.Size(320, 25);
             this.pr_batchnum.Str = null;
             this.pr_batchnum.Str1 = null;
             this.pr_batchnum.Str2 = null;
@@ -264,10 +278,11 @@
             this.Column6,
             this.Column7,
             this.Column8});
-            this.BatchProduct.Location = new System.Drawing.Point(0, 158);
+            this.BatchProduct.Location = new System.Drawing.Point(0, 198);
+            this.BatchProduct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.BatchProduct.Name = "BatchProduct";
             this.BatchProduct.RowTemplate.Height = 23;
-            this.BatchProduct.Size = new System.Drawing.Size(826, 353);
+            this.BatchProduct.Size = new System.Drawing.Size(1101, 441);
             this.BatchProduct.TabIndex = 174;
             // 
             // Column1
@@ -322,18 +337,20 @@
             // 
             this.sc_stepcode.AutoSize = true;
             this.sc_stepcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sc_stepcode.Location = new System.Drawing.Point(742, 94);
+            this.sc_stepcode.Location = new System.Drawing.Point(989, 118);
+            this.sc_stepcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sc_stepcode.Name = "sc_stepcode";
-            this.sc_stepcode.Size = new System.Drawing.Size(0, 21);
+            this.sc_stepcode.Size = new System.Drawing.Size(0, 27);
             this.sc_stepcode.TabIndex = 171;
             // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(742, 50);
+            this.pr_detail.Location = new System.Drawing.Point(989, 72);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 170;
             this.pr_detail.Tag = "pr_detail";
             // 
@@ -341,27 +358,30 @@
             // 
             this.ma_craftcode.AutoSize = true;
             this.ma_craftcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_craftcode.Location = new System.Drawing.Point(112, 94);
+            this.ma_craftcode.Location = new System.Drawing.Point(149, 118);
+            this.ma_craftcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_craftcode.Name = "ma_craftcode";
-            this.ma_craftcode.Size = new System.Drawing.Size(0, 21);
+            this.ma_craftcode.Size = new System.Drawing.Size(0, 27);
             this.ma_craftcode.TabIndex = 169;
             // 
             // sc_linecode
             // 
             this.sc_linecode.AutoSize = true;
             this.sc_linecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sc_linecode.Location = new System.Drawing.Point(421, 94);
+            this.sc_linecode.Location = new System.Drawing.Point(561, 118);
+            this.sc_linecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sc_linecode.Name = "sc_linecode";
-            this.sc_linecode.Size = new System.Drawing.Size(0, 21);
+            this.sc_linecode.Size = new System.Drawing.Size(0, 27);
             this.sc_linecode.TabIndex = 168;
             // 
             // ma_prodcode
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(421, 50);
+            this.ma_prodcode.Location = new System.Drawing.Point(561, 72);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 167;
             this.ma_prodcode.Tag = "ma_prodcode";
             // 
@@ -372,23 +392,24 @@
             this.Screen.DownImage = ((System.Drawing.Image)(resources.GetObject("Screen.DownImage")));
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
             this.Screen.IsShowBorder = true;
-            this.Screen.Location = new System.Drawing.Point(1013, 94);
+            this.Screen.Location = new System.Drawing.Point(1351, 118);
+            this.Screen.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
             this.Screen.Power = null;
-            this.Screen.Size = new System.Drawing.Size(60, 24);
+            this.Screen.Size = new System.Drawing.Size(80, 30);
             this.Screen.TabIndex = 154;
             this.Screen.Tag = "IfRead";
             this.Screen.Text = "刷新";
             this.Screen.UseVisualStyleBackColor = true;
             this.Screen.Click += new System.EventHandler(this.Screen_Click);
             // 
-            // 岗位备料
+            // Make_PositionStock
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1079, 560);
+            this.ClientSize = new System.Drawing.Size(1439, 700);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.Clean);
@@ -411,7 +432,8 @@
             this.Controls.Add(this.Screen);
             this.Controls.Add(this.panel2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "岗位备料";
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Name = "Make_PositionStock";
             this.Tag = "Make!PositionStock";
             this.Text = "岗位备料";
             this.Load += new System.EventHandler(this.岗位备料_Load);
@@ -441,7 +463,7 @@
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel sc_stepcode;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum BatchProduct;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_batchnum;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pr_batchnum;
         private System.Windows.Forms.Label label3;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;

UAS-MES/FunctionCode/Make/Make_PositionStock.resx

@@ -404,30 +404,6 @@
   <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="Screen.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

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

@@ -52,9 +52,9 @@
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.BadCodeGrid = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.GetSNCode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.GetSNCode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.cd_stepcode = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.cr_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.AddRow = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -736,7 +736,7 @@
         private CustomControl.ButtonUtil.NormalButton AddRow;
         private CustomControl.TextBoxWithIcon.SearchTextBox cr_code;
         private CustomControl.TextBoxWithIcon.SearchTextBox cd_stepcode;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox GetSNCode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox GetSNCode;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label GetSNCode_Label;
@@ -754,7 +754,7 @@
         private System.Windows.Forms.Label ms_sncode_label;
         private System.Windows.Forms.Label ma_code_label;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum BadCodeGrid;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;

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

@@ -40,11 +40,11 @@
             this.ma_qty = new System.Windows.Forms.Label();
             this.ma_qty_lable = new System.Windows.Forms.Label();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ReCall = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.changenum = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ms_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.changenum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ms_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SuspendLayout();
             // 
             // pr_detail
@@ -287,7 +287,7 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_makecode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ms_makecode;
         private System.Windows.Forms.Label pr_detail;
         private System.Windows.Forms.Label ms_makecode_label;
         private System.Windows.Forms.Label ma_prodcode;
@@ -295,13 +295,13 @@
         private System.Windows.Forms.Label ma_prodcode_label;
         private System.Windows.Forms.Label sncode_label;
         private System.Windows.Forms.CheckBox ChangeResult;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox changenum;
+        private CustomControl.TextBoxWithIcon.EnterTextBox changenum;
         private System.Windows.Forms.Label changenum_lanel;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private CustomControl.ButtonUtil.NormalButton ReCall;
         private System.Windows.Forms.Label ma_qty;
         private System.Windows.Forms.Label ma_qty_lable;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
     }
 }

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

@@ -84,7 +84,7 @@
             this.panel2.Location = new System.Drawing.Point(0, 0);
             this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1245, 36);
+            this.panel2.Size = new System.Drawing.Size(1230, 36);
             this.panel2.TabIndex = 30;
             // 
             // label1
@@ -306,7 +306,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(952, 240);
+            this.label6.Location = new System.Drawing.Point(946, 240);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(92, 27);
@@ -466,7 +466,7 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(957, 284);
+            this.OperateResult.Location = new System.Drawing.Point(951, 284);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(275, 382);
@@ -480,7 +480,7 @@
             this.CleanInfo.DownImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.DownImage")));
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
-            this.CleanInfo.Location = new System.Drawing.Point(1052, 681);
+            this.CleanInfo.Location = new System.Drawing.Point(1046, 681);
             this.CleanInfo.Margin = new System.Windows.Forms.Padding(4);
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
@@ -574,7 +574,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(1245, 780);
+            this.ClientSize = new System.Drawing.Size(1230, 740);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.label2);

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -123,50 +123,35 @@ namespace UAS_MES.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if (ms_sncode.Text.Trim() != "" && ma_code.Text != "")
+                string ErrorMessage = "";
+                bool ifFirst;
+                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
-                    string ErrorMessage = "";
-                    bool ifFirst;
-                    if (LogicHandler.CheckCurrentStepAndIfFirst(ms_sncode.Text, ma_code.Text, User.UserSourceCode, Tag.ToString(), out ifFirst, out ErrorMessage))
+                    string oMakeCode = "";
+                    string oMSID = "";
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                     {
-                        //如果采集为良品则不再允许采集
                         if (GoodProduct.Checked)
                         {
-                            dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_stepcode,ms_status from makeserial where ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + ma_code.Text + "'", "select");
+                            dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_stepcode,ms_status from makeserial where ms_id='" + oMSID + "'", "select");
                             string status = dt.Rows[0]["ms_status"].ToString();
                             string nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
                             string stepcode = dt.Rows[0]["ms_stepcode"].ToString();
-                            if (nextstepcode != User.CurrentStepCode && stepcode == User.CurrentStepCode && (status == "1" || status == "2"))
+                            if (stepcode == User.CurrentStepCode && (status == "1" || status == "2"))
                             {
                                 OperateResult.AppendText(">>该序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red);
                                 return;
                             }
+                            SetCollectResult();
                         }
-                        SetCollectResult();
+                        if (!Reject.Checked)
+                            ms_sncode.Text = "";
                     }
                     else
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                    if (!Reject.Checked)
-                        ms_sncode.Text = "";
-                }
-                else if (ma_code.Text == "")
-                {
-                    sql.Clear();
-                    sql.Append("select ma_code,ma_qty,ma_prodcode,mcd_inqty,ma_qty-mcd_inqty mcd_remainqty,pr_detail from make left join makeserial on ");
-                    sql.Append("ma_code=ms_makecode left join product on ms_prodcode=pr_code left join makecraftdetail on  ");
-                    sql.Append("mcd_macode=ms_makecode where ms_sncode='" + ms_sncode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        BaseUtil.SetFormValue(Controls, dt);
-                        SetCollectResult();
-                    }
-                    else
-                    {
-                        OperateResult.AppendText(">>序列号" + ms_sncode.Text + "不存在或不对应当前工序\n", Color.Red);
-                        return;
-                    }
                 }
+                else
+                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
             }
         }
 

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

@@ -47,19 +47,19 @@
             this.ob_maxngacceptqty_label = new System.Windows.Forms.Label();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.label5 = new System.Windows.Forms.Label();
-            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_result = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            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.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_result = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.WithdrawPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.BatchRejection = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ForcePass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -68,8 +68,8 @@
             this.BatchPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.ob_id = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_id = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -710,32 +710,32 @@
         private CustomControl.ButtonUtil.NormalButton WithdrawPass;
         private System.Windows.Forms.CheckBox ReworkRequire;
         private System.Windows.Forms.Label ob_aqlcode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_aqlcode;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_result;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_ngqty;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox oi_checkqty;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_okqty;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_batchqty;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_prodcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_aqlcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_result;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_ngqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox oi_checkqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_okqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_prodcode;
         private System.Windows.Forms.Label ob_prodcode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_makecode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_makecode;
         private System.Windows.Forms.Label ob_makecode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_checkno;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;
         private CustomControl.ButtonUtil.NormalButton GetBatch;
         private System.Windows.Forms.Label label3;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_maxngacceptqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_maxngacceptqty;
         private System.Windows.Forms.Label ob_maxngacceptqty_label;
         private System.Windows.Forms.RichTextBox richTextBox1;
         private System.Windows.Forms.Label label5;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_id;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_source;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_id;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_source;
     }
 }

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

@@ -47,15 +47,15 @@
             this.Delete = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SendOQC = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.RemoveAll = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.NewBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_prodcode = 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.CheckBatchDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
             this.勾选 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.ob_batchqty_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -559,21 +559,21 @@
         private System.Windows.Forms.Label label1;
         private CustomControl.DataGrid_View.DataGridViewExpand CheckBatchDGV;
         private System.Windows.Forms.Label obd_makecode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_checkno;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_prodcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ma_prodcode;
         private System.Windows.Forms.Label ob_prodcode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_status;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_status;
         private System.Windows.Forms.Label ob_status_label;
         private CustomControl.ButtonUtil.NormalButton NewBatch;
         private CustomControl.ButtonUtil.NormalButton RemoveAll;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_batchqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;
         private System.Windows.Forms.Label ob_batchqty_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_outboxcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_outboxcode;
         private System.Windows.Forms.Label pa_outboxcode_label;
         private System.Windows.Forms.CheckBox WithDraw;
         private CustomControl.ButtonUtil.NormalButton GetBatch;

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

@@ -44,12 +44,12 @@
             this.ob_aqlcode_label = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.ob_projectcode = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SaveConfiguration = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.RefreshConfiguration = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -60,13 +60,13 @@
             this.ci_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ci_kind = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.oi_sampleqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_kind = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pr_kind = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
             this.SuspendLayout();
@@ -626,36 +626,36 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_checkno;
+        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.MaCodeTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_batchqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;
         private System.Windows.Forms.Label ob_batchqty_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_source;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_source;
         private System.Windows.Forms.Label ob_source_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_kind;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pr_kind;
         private System.Windows.Forms.Label pr_kind_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_prodcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_prodcode;
         private System.Windows.Forms.Label ob_prodcode_label;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum CheckTypeDGV;
         private CustomControl.ButtonUtil.NormalButton Save;
         private CustomControl.ButtonUtil.NormalButton RefreshConfiguration;
         private CustomControl.ButtonUtil.NormalButton SaveConfiguration;
         private CustomControl.ButtonUtil.NormalButton GetBatch;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_remark;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_remark;
         private System.Windows.Forms.Label ob_remark_label;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_status;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_status;
         private System.Windows.Forms.Label ob_status_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_maxngacceptqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_maxngacceptqty;
         private System.Windows.Forms.Label ob_maxacceptqty_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_aqlcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_aqlcode;
         private System.Windows.Forms.Label ob_aqlcode_label;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;

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

@@ -50,11 +50,11 @@
             this.obd_outboxcode_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ob_makecode_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.obd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ob_projectcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_projectcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ChoosedDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
             this.bc_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bc_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -62,8 +62,8 @@
             this.Column3 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.bc_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bc_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.CheckTypeDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
             this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.oi_itemcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -74,19 +74,19 @@
             this.ois_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ChooseedReject = new UAS_MES.CustomControl.ButtonUtil.ArrowRightButton();
             this.WaitReject = new UAS_MES.CustomControl.ButtonUtil.ArrowLeftButton();
-            this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.bccode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.bccode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Refresh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.BatchPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            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();
             ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -851,35 +851,35 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_checkno;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private CustomControl.ButtonUtil.NormalButton Cancel;
         private CustomControl.ButtonUtil.NormalButton BatchPass;
         private CustomControl.ButtonUtil.NormalButton GetBatch;
         private new CustomControl.ButtonUtil.NormalButton Refresh;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox bccode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox bccode;
         private System.Windows.Forms.Label ob_status_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_batchqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;
         private System.Windows.Forms.Label label1;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_okqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_okqty;
         private System.Windows.Forms.Label label4;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_ngqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_ngqty;
         private System.Windows.Forms.Label label5;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox oi_checkqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox oi_checkqty;
         private System.Windows.Forms.Label label6;
         private CustomControl.ButtonUtil.ArrowRightButton ChooseedReject;
         private CustomControl.ButtonUtil.ArrowLeftButton WaitReject;
         private System.Windows.Forms.Label label9;
         private CustomControl.DataGrid_View.DataGridViewExpand CheckTypeDGV;
         private System.Windows.Forms.CheckBox ChooseAll;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox sncode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
         private System.Windows.Forms.Label label10;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_remark;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_remark;
         private System.Windows.Forms.Label ob_remark_label;
         private CustomControl.DataGrid_View.DataGridViewExpand WaitChooseDGV;
         private CustomControl.DataGrid_View.DataGridViewExpand ChoosedDGV;
@@ -888,16 +888,16 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn obd_outboxcode_dgv;
         private System.Windows.Forms.DataGridViewTextBoxColumn ob_makecode_dgv;
         private System.Windows.Forms.DataGridViewTextBoxColumn obd_id;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_makecode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_makecode;
         private System.Windows.Forms.Label obd_makecode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_prodcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_prodcode;
         private System.Windows.Forms.Label ob_prodcode_label;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private System.Windows.Forms.Label ob_status;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_code1;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_name1;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_projectcode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_projectcode;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_code;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_name;

UAS-MES/PublicMethod/LogicHandler.cs

@@ -8,56 +8,7 @@ namespace UAS_MES.PublicMethod
 {
     class LogicHandler
     {
-        private static Dictionary<string, string> Caller_Field = new Dictionary<string, string>();
-
-        public LogicHandler()
-        {
-            //根据不同的Caller来判断不同的验证条件
-            Caller_Field.Add("SMT!SMTFeeding", "");
-            Caller_Field.Add("SMT!MaterialsWaring", "");
-            Caller_Field.Add("SMT!ChangeLine", "");
-            Caller_Field.Add("Make!PackageCollection", "");
-            Caller_Field.Add("Make!FeedingCollection", "cd_ifinput");
-            Caller_Field.Add("Make!TestCollection", "cd_iftest");
-            Caller_Field.Add("Make!BoxUp", "");
-            Caller_Field.Add("Make!Repair", "");
-            Caller_Field.Add("Make!SplitBoard", "");
-            Caller_Field.Add("Make!SeqTransform", "cd_ifsnchange");
-            Caller_Field.Add("Quality!QCTask", "");
-            Caller_Field.Add("Quality!SamplingConfirm", "");
-            Caller_Field.Add("Quality!BatchJudge", "");
-            Caller_Field.Add("Quality!BatchQuery", "");
-            Caller_Field.Add("Special!MixPackage", "");
-            Caller_Field.Add("Special!CancelCollection", "");
-            Caller_Field.Add("Special!SeqTransform", "");
-            Caller_Field.Add("Special!QCForce", "");
-            Caller_Field.Add("Specail!MendLabel", "");
-            Caller_Field.Add("Special!BoxSplit", "");
-            Caller_Field.Add("Warehouse!In", "");
-            Caller_Field.Add("Warehouse!Out", "");
-            Caller_Field.Add("Warehouse!FinishedProductIn", "");
-            Caller_Field.Add("Warehouse!FinishedProductOut", "");
-            Caller_Field.Add("Warehouse!PalletWeigh", "");
-            Caller_Field.Add("Query!ExeProgress", "");
-            Caller_Field.Add("Quert!RealTime", "");
-            Caller_Field.Add("Query!OnlineTraceBack", "");
-            Caller_Field.Add("Query!ProductTraceBack", "");
-            Caller_Field.Add("Setup!ScaleTest", "");
-            Caller_Field.Add("Setup!PrinterTest", "");
-            Caller_Field.Add("Setup!LabelMaintain", "");
-            Caller_Field.Add("Stock!Split", "");
-            Caller_Field.Add("Stock!Combine", "");
-            Caller_Field.Add("Stock!BarcodeInf", "");
-            Caller_Field.Add("Stock!WarehouseTransform", "");
-            Caller_Field.Add("Sotck!StorageTransform", "");
-            Caller_Field.Add("OQC!SamplingDataCollection", "cd_ifoqc");
-            Caller_Field.Add("Make!FuselageLabelPrint", "");
-            Caller_Field.Add("Make!ColorBoxLabelPrint", "");
-            Caller_Field.Add("Make!CartonBoxWeigh", "");
-            Caller_Field.Add("Make!ColorBoxWeigh", "cd_ifinput");
-            Caller_Field.Add("Make!BigBoxWeigh", "cd_ifpack");
-            Caller_Field.Add("Make!PalletWeigh", "cd_ifpack");
-        }
+        public LogicHandler() { }
 
         static DataHelper dh = new DataHelper();
         //用于拼接SQL
@@ -85,7 +36,6 @@ namespace UAS_MES.PublicMethod
             string StepCode = "";
             string StepName = "";
             string LineCode = "";
-
             //如果传入的工单为空的话
             if (iMakeCode == "")
                 if (!GetMakeInfo(iSnCode, out iMakeCode, out oErrorMessage))
@@ -95,7 +45,8 @@ namespace UAS_MES.PublicMethod
             string cr_code = "";
             //获取岗位资源对应的工序编号和名称
             GetStepCodeAndNameAndLineBySource(iSourceCode, ref StepCode, ref StepName, ref LineCode);
-            if (Caller_Field[iCaller] != "")
+            string fo_class = dh.getFieldDataByCondition("cs_form", "fo_class", "fo_caller='" + iCaller + "'").ToString();
+            if (fo_class != "")
             {
                 DataTable dt1 = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_makecode", "ms_status" }, "ms_sncode='" + iSnCode + "'");
                 if (dt1.Rows.Count > 0)
@@ -118,7 +69,7 @@ namespace UAS_MES.PublicMethod
                     }
                 }
                 sql.Clear();
-                sql.Append("select " + Caller_Field[iCaller] + ",cd_ifinput ifinput,cr_code from  make left join craft on cr_code=ma_craftcode left join craftdetail on cd_crid=cr_id ");
+                sql.Append("select " + fo_class + ",cd_ifinput ifinput,cr_code from  make left join craft on cr_code=ma_craftcode left join craftdetail on cd_crid=cr_id ");
                 sql.Append("where ma_code='" + iMakeCode + "' and cd_stepcode='" + StepCode + "'");
                 //获取的行号不等于0，存在记录检测通过
                 dt1 = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
@@ -126,11 +77,11 @@ namespace UAS_MES.PublicMethod
                 {
                     cd_ifinput = dt1.Rows[0]["ifinput"].ToString();
                     cr_code = dt1.Rows[0]["cr_code"].ToString();
-                    if (dt1.Rows[0][Caller_Field[iCaller]].ToString() != "-1")
+                    if (dt1.Rows[0][fo_class].ToString() != "-1")
                     {
                         //返回具体的工单信息
                         string serial = "";
-                        switch (Caller_Field[iCaller])
+                        switch (fo_class)
                         {
                             case "cd_ifinput":
                                 serial = "上料采集";
@@ -452,6 +403,30 @@ namespace UAS_MES.PublicMethod
             return false;
         }
 
+        public static bool CheckStepAttribute(string iCaller, string iSource, out string oErrorMessage)
+        {
+            oErrorMessage = "";
+            string[] param = new string[] { iCaller, iSource, oErrorMessage };
+            dh.CallProcedure("CS_CHECKSTEPATTRIBUTE", ref param);
+            if (oErrorMessage == "")
+                return true;
+            else
+                return false;
+        }
+
+        public static bool CheckStepSNAndMacode(string iMakeCode, string iSource, string iSN, string iUserCode, out string oMakeCode, out string oMsID, out string oErrorMessage)
+        {
+            oErrorMessage = "";
+            oMakeCode = "";
+            oMsID = "";
+            string[] param = new string[] { iMakeCode, iSource, iSN, iUserCode, oMakeCode, oMsID, oErrorMessage };
+            dh.CallProcedure("CS_CHECKSTEPSNANDMACODE", ref param);
+            if (oErrorMessage == "")
+                return true;
+            else
+                return false;
+        }
+
         /// <summary>
         /// 分配Mac地址和BT地址
         /// </summary>
@@ -1012,6 +987,16 @@ namespace UAS_MES.PublicMethod
                 return false;
         }
 
+        public static bool SetFinish(string iMakeCode, string iSource, string iSN, string iUserCode, out string oErrorMessage)
+        {
+            oErrorMessage = "";
+            string[] param = new string[] { iMakeCode, iSource, iSN, iUserCode, oErrorMessage };
+            dh.CallProcedure("CS_SETFINISH", ref param);
+            if (oErrorMessage == "")
+                return true;
+            else
+                return false;
+        }
 
         /// <summary>
         /// 方法说明：测试详细信息录入系统，针对一个SN多个测试项目结果可循环调用

UAS-MES/UAS-MES.csproj

@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
     <TargetFrameworkProfile />
     <SccProjectName>
     </SccProjectName>
@@ -24,21 +24,24 @@
     </SccProvider>
     <PublishUrl>F:\MESRelease\</PublishUrl>
     <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
+    <InstallFrom>Web</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>true</UpdateRequired>
+    <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
+    <InstallUrl>http://218.17.158.219:8888/</InstallUrl>
+    <UpdateUrl>http://218.17.158.219:8888/</UpdateUrl>
     <TargetCulture>zh</TargetCulture>
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.59</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.1</MinimumRequiredVersion>
+    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>185</ApplicationRevision>
+    <ApplicationRevision>190</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -56,6 +59,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>
     <UseVSHostingProcess>true</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\Debug\UAS_MES.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -65,12 +70,14 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>0702B5BD480611CA32663309A8FD3717B722E307</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>Cert\深圳市优软科技有限公司.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -79,7 +86,7 @@
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject />
+    <StartupObject>UAS_MES.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>
@@ -1420,9 +1427,7 @@
       <FileType>Assembly</FileType>
     </PublishFile>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\DataSources\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.