修改界面大小

UAS-MES/App.config

@@ -41,7 +41,7 @@
   <applicationSettings>
     <UAS_MES.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Password=select!#%*(;User ID=UAS_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES.Properties.Settings>
   </applicationSettings>

UAS-MES/CustomControl/AccordionMenu/AccordionMenu.cs

@@ -29,7 +29,7 @@ namespace UAS_MES.CustomControl.AccordionMenu
         /// <summary>
         /// 功能面板的宽度
         /// </summary>
-        private int m_nPanFunWidth = 150;
+        private int m_nPanFunWidth = 140;
         //功能面板隐藏后的宽度
         private int m_nPanFunHideWidth = 0;
         //Tabpage的索引

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

@@ -84,10 +84,10 @@
             // 
             this.mcd_waitqty_label.AutoSize = true;
             this.mcd_waitqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_waitqty_label.Location = new System.Drawing.Point(20, 729);
+            this.mcd_waitqty_label.Location = new System.Drawing.Point(18, 607);
             this.mcd_waitqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_waitqty_label.Name = "mcd_waitqty_label";
-            this.mcd_waitqty_label.Size = new System.Drawing.Size(68, 31);
+            this.mcd_waitqty_label.Size = new System.Drawing.Size(57, 27);
             this.mcd_waitqty_label.TabIndex = 65;
             this.mcd_waitqty_label.Text = "待称:";
             // 
@@ -95,10 +95,10 @@
             // 
             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(18, 650);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(16, 542);
             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(68, 31);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(57, 27);
             this.mcd_okqty_label.TabIndex = 64;
             this.mcd_okqty_label.Text = "已称:";
             // 
@@ -106,10 +106,10 @@
             // 
             this.pr_colorboxgw_label.AutoSize = true;
             this.pr_colorboxgw_label.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw_label.Location = new System.Drawing.Point(34, 102);
+            this.pr_colorboxgw_label.Location = new System.Drawing.Point(30, 85);
             this.pr_colorboxgw_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxgw_label.Name = "pr_colorboxgw_label";
-            this.pr_colorboxgw_label.Size = new System.Drawing.Size(164, 46);
+            this.pr_colorboxgw_label.Size = new System.Drawing.Size(137, 39);
             this.pr_colorboxgw_label.TabIndex = 42;
             this.pr_colorboxgw_label.Text = "标准重量";
             // 
@@ -117,10 +117,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(33, 26);
+            this.pr_code_label.Location = new System.Drawing.Point(29, 22);
             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(164, 46);
+            this.pr_code_label.Size = new System.Drawing.Size(137, 39);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -130,10 +130,10 @@
             this.pr_colorboxunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_colorboxunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_colorboxunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_colorboxunit.Location = new System.Drawing.Point(476, 78);
+            this.pr_colorboxunit.Location = new System.Drawing.Point(423, 65);
             this.pr_colorboxunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxunit.Name = "pr_colorboxunit";
-            this.pr_colorboxunit.Size = new System.Drawing.Size(46, 38);
+            this.pr_colorboxunit.Size = new System.Drawing.Size(38, 31);
             this.pr_colorboxunit.TabIndex = 42;
             this.pr_colorboxunit.Text = "克";
             // 
@@ -144,20 +144,20 @@
             this.panel6.Controls.Add(this.pr_code);
             this.panel6.Controls.Add(this.pr_colorboxgw_label);
             this.panel6.Controls.Add(this.pr_code_label);
-            this.panel6.Location = new System.Drawing.Point(666, 118);
-            this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel6.Location = new System.Drawing.Point(592, 98);
+            this.panel6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(570, 184);
+            this.panel6.Size = new System.Drawing.Size(507, 154);
             this.panel6.TabIndex = 62;
             // 
             // pr_colorboxgw
             // 
             this.pr_colorboxgw.AutoSize = true;
             this.pr_colorboxgw.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw.Location = new System.Drawing.Point(270, 102);
+            this.pr_colorboxgw.Location = new System.Drawing.Point(240, 85);
             this.pr_colorboxgw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxgw.Name = "pr_colorboxgw";
-            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 46);
+            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 39);
             this.pr_colorboxgw.TabIndex = 80;
             this.pr_colorboxgw.Tag = "1";
             // 
@@ -165,10 +165,10 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(270, 26);
+            this.pr_code.Location = new System.Drawing.Point(240, 22);
             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, 46);
+            this.pr_code.Size = new System.Drawing.Size(0, 39);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
@@ -179,22 +179,22 @@
             this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(24, 78);
+            this.label22.Location = new System.Drawing.Point(21, 65);
             this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(75, 38);
+            this.label22.Size = new System.Drawing.Size(62, 31);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
             // weight
             // 
             this.weight.AutoSize = true;
-            this.weight.Font = new System.Drawing.Font("微软雅黑", 42F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.weight.Font = new System.Drawing.Font("微软雅黑", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(146, 39);
+            this.weight.Location = new System.Drawing.Point(130, 52);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 110);
+            this.weight.Size = new System.Drawing.Size(0, 57);
             this.weight.TabIndex = 41;
             // 
             // panel4
@@ -203,20 +203,20 @@
             this.panel4.Controls.Add(this.pr_colorboxunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(24, 118);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel4.Location = new System.Drawing.Point(21, 98);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(620, 184);
+            this.panel4.Size = new System.Drawing.Size(551, 154);
             this.panel4.TabIndex = 63;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(22, 28);
+            this.label15.Location = new System.Drawing.Point(20, 23);
             this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(128, 46);
+            this.label15.Size = new System.Drawing.Size(107, 39);
             this.label15.TabIndex = 56;
             this.label15.Text = "条码号";
             // 
@@ -224,10 +224,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, 484);
+            this.pr_detail_label.Location = new System.Drawing.Point(18, 403);
             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(110, 31);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 53;
             this.pr_detail_label.Text = "产品型号";
             // 
@@ -236,20 +236,20 @@
             this.Temp1.AutoSize = true;
             this.Temp1.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Temp1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.Temp1.Location = new System.Drawing.Point(134, 42);
+            this.Temp1.Location = new System.Drawing.Point(76, 35);
             this.Temp1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Temp1.Name = "Temp1";
-            this.Temp1.Size = new System.Drawing.Size(0, 57);
+            this.Temp1.Size = new System.Drawing.Size(0, 48);
             this.Temp1.TabIndex = 38;
             // 
             // panel3
             // 
             this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel3.Controls.Add(this.Temp1);
-            this.panel3.Location = new System.Drawing.Point(666, 328);
-            this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel3.Location = new System.Drawing.Point(592, 273);
+            this.panel3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(570, 146);
+            this.panel3.Size = new System.Drawing.Size(507, 122);
             this.panel3.TabIndex = 52;
             // 
             // Temp2
@@ -257,10 +257,10 @@
             this.Temp2.AutoSize = true;
             this.Temp2.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Temp2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.Temp2.Location = new System.Drawing.Point(134, 50);
+            this.Temp2.Location = new System.Drawing.Point(76, 32);
             this.Temp2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Temp2.Name = "Temp2";
-            this.Temp2.Size = new System.Drawing.Size(0, 57);
+            this.Temp2.Size = new System.Drawing.Size(0, 48);
             this.Temp2.TabIndex = 39;
             // 
             // panel2
@@ -268,20 +268,20 @@
             this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel2.Controls.Add(this.Temp2);
             this.panel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.panel2.Location = new System.Drawing.Point(666, 514);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Location = new System.Drawing.Point(592, 428);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(570, 146);
+            this.panel2.Size = new System.Drawing.Size(507, 122);
             this.panel2.TabIndex = 51;
             // 
             // ma_qty_label
             // 
             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(20, 573);
+            this.ma_qty_label.Location = new System.Drawing.Point(18, 477);
             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(110, 31);
+            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
             this.ma_qty_label.TabIndex = 55;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -289,10 +289,10 @@
             // 
             this.ma_salecode_label.AutoSize = true;
             this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode_label.Location = new System.Drawing.Point(20, 404);
+            this.ma_salecode_label.Location = new System.Drawing.Point(18, 337);
             this.ma_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_salecode_label.Name = "ma_salecode_label";
-            this.ma_salecode_label.Size = new System.Drawing.Size(110, 31);
+            this.ma_salecode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_salecode_label.TabIndex = 54;
             this.ma_salecode_label.Text = "订单编号";
             // 
@@ -301,30 +301,30 @@
             this.Temp3.AutoSize = true;
             this.Temp3.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Temp3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.Temp3.Location = new System.Drawing.Point(135, 45);
+            this.Temp3.Location = new System.Drawing.Point(76, 32);
             this.Temp3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Temp3.Name = "Temp3";
-            this.Temp3.Size = new System.Drawing.Size(0, 57);
+            this.Temp3.Size = new System.Drawing.Size(0, 48);
             this.Temp3.TabIndex = 40;
             // 
             // panel1
             // 
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Controls.Add(this.Temp3);
-            this.panel1.Location = new System.Drawing.Point(666, 700);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel1.Location = new System.Drawing.Point(592, 583);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(570, 146);
+            this.panel1.Size = new System.Drawing.Size(507, 122);
             this.panel1.TabIndex = 50;
             // 
             // ms_makecode_label
             // 
             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(20, 328);
+            this.ms_makecode_label.Location = new System.Drawing.Point(18, 273);
             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(110, 31);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 72;
             this.ms_makecode_label.Text = "制造单号";
             // 
@@ -332,20 +332,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1428, 180);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PrintLabel.Location = new System.Drawing.Point(1269, 150);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(180, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(160, 23);
             this.PrintLabel.TabIndex = 159;
             // 
             // Printer_label
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Printer_label.Location = new System.Drawing.Point(1264, 130);
+            this.Printer_label.Location = new System.Drawing.Point(1124, 108);
             this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(123, 30);
+            this.Printer_label.Size = new System.Drawing.Size(107, 25);
             this.Printer_label.TabIndex = 162;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -353,10 +353,10 @@
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(1287, 178);
+            this.PrintLabel_label.Location = new System.Drawing.Point(1144, 148);
             this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(101, 30);
+            this.PrintLabel_label.Size = new System.Drawing.Size(88, 25);
             this.PrintLabel_label.TabIndex = 163;
             this.PrintLabel_label.Text = "打印标签";
             // 
@@ -364,19 +364,19 @@
             // 
             this.ComList_label.AutoSize = true;
             this.ComList_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ComList_label.Location = new System.Drawing.Point(1329, 82);
+            this.ComList_label.Location = new System.Drawing.Point(1181, 68);
             this.ComList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ComList_label.Name = "ComList_label";
-            this.ComList_label.Size = new System.Drawing.Size(57, 30);
+            this.ComList_label.Size = new System.Drawing.Size(50, 25);
             this.ComList_label.TabIndex = 164;
             this.ComList_label.Text = "串口";
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1428, 130);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Printer.Location = new System.Drawing.Point(1269, 108);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(180, 38);
+            this.Printer.Size = new System.Drawing.Size(160, 32);
             this.Printer.TabIndex = 160;
             // 
             // StopWeight
@@ -386,13 +386,13 @@
             this.StopWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.DownImage")));
             this.StopWeight.Image = ((System.Drawing.Image)(resources.GetObject("StopWeight.Image")));
             this.StopWeight.IsShowBorder = true;
-            this.StopWeight.Location = new System.Drawing.Point(1124, 39);
-            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.StopWeight.Location = new System.Drawing.Point(999, 32);
+            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.StopWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.MoveImage")));
             this.StopWeight.Name = "StopWeight";
             this.StopWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.NormalImage")));
             this.StopWeight.Power = null;
-            this.StopWeight.Size = new System.Drawing.Size(112, 36);
+            this.StopWeight.Size = new System.Drawing.Size(100, 30);
             this.StopWeight.TabIndex = 158;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -405,13 +405,13 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(990, 39);
-            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.StartWeight.Location = new System.Drawing.Point(880, 32);
+            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
             this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
             this.StartWeight.Power = null;
-            this.StartWeight.Size = new System.Drawing.Size(112, 36);
+            this.StartWeight.Size = new System.Drawing.Size(100, 30);
             this.StartWeight.TabIndex = 157;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -421,20 +421,20 @@
             // 
             this.mcd_waitqty.AutoSize = true;
             this.mcd_waitqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_waitqty.Location = new System.Drawing.Point(114, 729);
+            this.mcd_waitqty.Location = new System.Drawing.Point(101, 607);
             this.mcd_waitqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_waitqty.Name = "mcd_waitqty";
-            this.mcd_waitqty.Size = new System.Drawing.Size(0, 31);
+            this.mcd_waitqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_waitqty.TabIndex = 155;
             // 
             // mcd_qty
             // 
             this.mcd_qty.AutoSize = true;
             this.mcd_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_qty.Location = new System.Drawing.Point(116, 650);
+            this.mcd_qty.Location = new System.Drawing.Point(103, 542);
             this.mcd_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_qty.Name = "mcd_qty";
-            this.mcd_qty.Size = new System.Drawing.Size(0, 31);
+            this.mcd_qty.Size = new System.Drawing.Size(0, 27);
             this.mcd_qty.TabIndex = 154;
             this.mcd_qty.Tag = "1";
             // 
@@ -445,13 +445,13 @@
             this.Cancel.DownImage = ((System.Drawing.Image)(resources.GetObject("Cancel.DownImage")));
             this.Cancel.Image = ((System.Drawing.Image)(resources.GetObject("Cancel.Image")));
             this.Cancel.IsShowBorder = true;
-            this.Cancel.Location = new System.Drawing.Point(1474, 220);
-            this.Cancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Cancel.Location = new System.Drawing.Point(1310, 183);
+            this.Cancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("Cancel.MoveImage")));
             this.Cancel.Name = "Cancel";
             this.Cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("Cancel.NormalImage")));
             this.Cancel.Power = null;
-            this.Cancel.Size = new System.Drawing.Size(90, 36);
+            this.Cancel.Size = new System.Drawing.Size(80, 30);
             this.Cancel.TabIndex = 153;
             this.Cancel.Text = "取消";
             this.Cancel.UseVisualStyleBackColor = true;
@@ -464,13 +464,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(1334, 220);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Confirm.Location = new System.Drawing.Point(1186, 183);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             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(90, 36);
+            this.Confirm.Size = new System.Drawing.Size(80, 30);
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "打印";
             this.Confirm.UseVisualStyleBackColor = true;
@@ -480,10 +480,10 @@
             // 
             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(156, 328);
+            this.ms_makecode.Location = new System.Drawing.Point(139, 273);
             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, 31);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode.TabIndex = 77;
             this.ms_makecode.Tag = "1";
             // 
@@ -491,30 +491,30 @@
             // 
             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(156, 573);
+            this.ma_qty.Location = new System.Drawing.Point(139, 477);
             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, 31);
+            this.ma_qty.Size = new System.Drawing.Size(0, 27);
             this.ma_qty.TabIndex = 76;
             // 
             // 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(156, 484);
+            this.pr_detail.Location = new System.Drawing.Point(139, 403);
             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, 31);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 75;
             // 
             // ma_salecode
             // 
             this.ma_salecode.AutoSize = true;
             this.ma_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode.Location = new System.Drawing.Point(156, 404);
+            this.ma_salecode.Location = new System.Drawing.Point(139, 337);
             this.ma_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_salecode.Name = "ma_salecode";
-            this.ma_salecode.Size = new System.Drawing.Size(0, 31);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 27);
             this.ma_salecode.TabIndex = 73;
             // 
             // Clean
@@ -524,13 +524,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(1410, 814);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Location = new System.Drawing.Point(1253, 678);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             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(90, 36);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 60;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -543,8 +543,8 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = ((System.Drawing.Image)(resources.GetObject("normalButton1.Image")));
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(32, 81);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.normalButton1.Location = new System.Drawing.Point(28, 67);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -560,11 +560,11 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(160, 28);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sncode.Location = new System.Drawing.Point(142, 23);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.sncode.Name = "sncode";
             this.sncode.Power = "ifwrite";
-            this.sncode.Size = new System.Drawing.Size(810, 55);
+            this.sncode.Size = new System.Drawing.Size(720, 47);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -574,10 +574,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(1262, 278);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Location = new System.Drawing.Point(1122, 232);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(385, 518);
+            this.OperateResult.Size = new System.Drawing.Size(343, 432);
             this.OperateResult.TabIndex = 58;
             this.OperateResult.Text = "";
             // 
@@ -585,10 +585,10 @@
             // 
             this.BaudRate_label.AutoSize = true;
             this.BaudRate_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BaudRate_label.Location = new System.Drawing.Point(1306, 40);
+            this.BaudRate_label.Location = new System.Drawing.Point(1161, 33);
             this.BaudRate_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.BaudRate_label.Name = "BaudRate_label";
-            this.BaudRate_label.Size = new System.Drawing.Size(79, 30);
+            this.BaudRate_label.Size = new System.Drawing.Size(69, 25);
             this.BaudRate_label.TabIndex = 165;
             this.BaudRate_label.Text = "波特率";
             // 
@@ -597,12 +597,12 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(1428, 39);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.BaudRate.Location = new System.Drawing.Point(1269, 32);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
             this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(178, 28);
+            this.BaudRate.Size = new System.Drawing.Size(159, 25);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -610,16 +610,17 @@
             // 
             // ComList
             // 
-            this.ComList.Location = new System.Drawing.Point(1428, 82);
+            this.ComList.Location = new System.Drawing.Point(1269, 68);
+            this.ComList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(182, 30);
+            this.ComList.Size = new System.Drawing.Size(162, 25);
             this.ComList.TabIndex = 167;
             // 
             // Make_ColorBoxWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1665, 876);
+            this.ClientSize = new System.Drawing.Size(1480, 730);
             this.Controls.Add(this.ComList);
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.BaudRate_label);
@@ -655,24 +656,24 @@
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.panel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "Make_ColorBoxWeigh";
             this.Tag = "Make!ColorBoxWeigh";
             this.Text = "彩盒称重";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.彩盒称重_FormClosing);
             this.Load += new System.EventHandler(this.彩盒上料打印_Load);
             this.SizeChanged += new System.EventHandler(this.彩盒称重_SizeChanged);
-            this.panel6.ResumeLayout(true);
+            this.panel6.ResumeLayout(false);
             this.panel6.PerformLayout();
-            this.panel4.ResumeLayout(true);
+            this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
-            this.panel3.ResumeLayout(true);
+            this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
-            this.panel2.ResumeLayout(true);
+            this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
-            this.panel1.ResumeLayout(true);
+            this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

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

@@ -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(983, 29);
+            this.panel2.Size = new System.Drawing.Size(1197, 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.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(609, 109);
+            this.mcd_restqty_label.Location = new System.Drawing.Point(780, 114);
+            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 = "待采集数";
             // 
@@ -98,9 +101,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(335, 109);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(415, 114);
+            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 = "已采集数";
             // 
@@ -108,9 +112,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(12, 114);
+            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 = "工单数量";
             // 
@@ -118,9 +123,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(12, 52);
+            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 = "归属工单";
             // 
@@ -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(609, 59);
+            this.pr_detail_label.Location = new System.Drawing.Point(780, 52);
+            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 = "产品名称";
             // 
@@ -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(335, 59);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(415, 52);
+            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 = "产品代码";
             // 
@@ -150,9 +158,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(24, 540);
+            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 = "上料";
@@ -163,9 +172,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(131, 540);
+            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;
@@ -174,9 +184,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(19, 587);
+            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 = "序列号";
             // 
@@ -184,9 +195,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(19, 643);
+            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 = "录入框";
             // 
@@ -194,9 +206,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(385, 587);
+            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;
@@ -205,9 +218,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(907, 186);
+            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;
@@ -216,9 +230,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(907, 277);
+            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;
@@ -227,9 +242,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(351, 591);
+            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);
@@ -238,27 +254,30 @@
             // 
             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(425, 59);
+            this.ma_prodcode.Location = new System.Drawing.Point(535, 52);
+            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(699, 59);
+            this.pr_detail.Location = new System.Drawing.Point(900, 52);
+            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(698, 109);
+            this.mcd_remainqty.Location = new System.Drawing.Point(899, 114);
+            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";
             // 
@@ -266,26 +285,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(425, 109);
+            this.mcd_inqty.Location = new System.Drawing.Point(535, 114);
+            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(120, 109);
+            this.ma_qty.Location = new System.Drawing.Point(128, 114);
+            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(17, 160);
+            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 = "";
             // 
@@ -296,12 +318,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(789, 541);
+            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;
@@ -314,10 +337,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(1029, 186);
+            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(140, 25);
             this.softwareversion.Str = null;
             this.softwareversion.Str1 = null;
             this.softwareversion.Str2 = null;
@@ -330,10 +354,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(1029, 283);
+            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(140, 25);
             this.ecn.Str = null;
             this.ecn.Str1 = null;
             this.ecn.Str2 = null;
@@ -346,12 +371,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(385, 640);
+            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 = "确认";
@@ -363,10 +389,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(131, 643);
+            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;
@@ -380,10 +407,11 @@
             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(131, 587);
+            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;
@@ -394,10 +422,10 @@
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(272, 62);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(2);
+            this.LockMakeCode.Location = new System.Drawing.Point(331, 56);
+            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(51, 21);
+            this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
             this.LockMakeCode.TabIndex = 140;
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
@@ -409,13 +437,13 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(120, 61);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(2);
+            this.ma_code.Location = new System.Drawing.Point(128, 54);
+            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(146, 21);
+            this.ma_code.Size = new System.Drawing.Size(189, 26);
             this.ma_code.TabIndex = 141;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -423,9 +451,9 @@
             // 
             // 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(1197, 680);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.ClearSn_code);
@@ -456,6 +484,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 = "上料采集";

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

@@ -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(1230, 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(804, 99);
+            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, 99);
+            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(406, 99);
+            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, 58);
+            this.ma_code_label.Location = new System.Drawing.Point(13, 53);
+            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, 58);
+            this.pr_detail_label.Location = new System.Drawing.Point(804, 53);
+            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, 58);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(406, 53);
+            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(13, 637);
+            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.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(12, 132);
+            this.label2.Location = new System.Drawing.Point(16, 146);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 22);
+            this.label2.Size = new System.Drawing.Size(92, 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, 58);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(2);
+            this.ma_code.Location = new System.Drawing.Point(136, 53);
+            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, 21);
+            this.ma_code.Size = new System.Drawing.Size(231, 26);
             this.ma_code.TabIndex = 180;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -193,12 +203,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(1045, 634);
+            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 = "清除";
@@ -208,9 +219,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(952, 180);
+            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(271, 440);
             this.OperateResult.TabIndex = 178;
             this.OperateResult.Text = "";
             // 
@@ -221,12 +233,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, 525);
+            this.Confirm.Location = new System.Drawing.Point(458, 634);
+            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 = "确认";
@@ -240,10 +253,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(114, 637);
+            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;
@@ -263,10 +277,11 @@
             this.Column6,
             this.Column7,
             this.Column8});
-            this.BatchProduct.Location = new System.Drawing.Point(0, 158);
+            this.BatchProduct.Location = new System.Drawing.Point(0, 179);
+            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(936, 441);
             this.BatchProduct.TabIndex = 174;
             // 
             // Column1
@@ -321,18 +336,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(936, 99);
+            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, 58);
+            this.pr_detail.Location = new System.Drawing.Point(936, 53);
+            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";
             // 
@@ -340,27 +357,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(136, 99);
+            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(535, 99);
+            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, 58);
+            this.ma_prodcode.Location = new System.Drawing.Point(535, 53);
+            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";
             this.ma_prodcode.TextChanged += new System.EventHandler(this.ma_prodcode_TextChanged);
@@ -372,12 +392,13 @@
             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(1143, 99);
+            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 = "刷新";
@@ -386,9 +407,9 @@
             // 
             // 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(1230, 675);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.Clean);
@@ -411,6 +432,7 @@
             this.Controls.Add(this.Screen);
             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_PositionStock";
             this.Tag = "Make!PositionStock";
             this.Text = "岗位备料";

UAS-MES/FunctionCode/Make/Make_PositionStock.resx

@@ -404,6 +404,30 @@
   <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

@@ -105,9 +105,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.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1327, 36);
+            this.panel2.Size = new System.Drawing.Size(1256, 36);
             this.panel2.TabIndex = 32;
             // 
             // label1
@@ -128,7 +128,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             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(16, 98);
+            this.ma_craftcode_label.Location = new System.Drawing.Point(10, 102);
             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(92, 27);
@@ -141,7 +141,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.st_rstepcode_label.AutoSize = true;
             this.st_rstepcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_rstepcode_label.Location = new System.Drawing.Point(415, 98);
+            this.st_rstepcode_label.Location = new System.Drawing.Point(344, 103);
             this.st_rstepcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_rstepcode_label.Name = "st_rstepcode_label";
             this.st_rstepcode_label.Size = new System.Drawing.Size(92, 27);
@@ -154,7 +154,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_prodcode_label.AutoSize = true;
             this.ms_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode_label.Location = new System.Drawing.Point(621, 51);
+            this.ms_prodcode_label.Location = new System.Drawing.Point(568, 55);
             this.ms_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_prodcode_label.Name = "ms_prodcode_label";
             this.ms_prodcode_label.Size = new System.Drawing.Size(92, 27);
@@ -167,7 +167,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             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(927, 51);
+            this.pr_detail_label.Location = new System.Drawing.Point(874, 55);
             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);
@@ -178,7 +178,7 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(988, 192);
+            this.label14.Location = new System.Drawing.Point(947, 192);
             this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(92, 27);
@@ -190,7 +190,7 @@
             this.bc_name_label.AutoSize = true;
             this.bc_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_name_label.ForeColor = System.Drawing.Color.Black;
-            this.bc_name_label.Location = new System.Drawing.Point(611, 192);
+            this.bc_name_label.Location = new System.Drawing.Point(578, 192);
             this.bc_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_name_label.Name = "bc_name_label";
             this.bc_name_label.Size = new System.Drawing.Size(92, 27);
@@ -201,7 +201,7 @@
             // 
             this.bg_name_label.AutoSize = true;
             this.bg_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bg_name_label.Location = new System.Drawing.Point(235, 190);
+            this.bg_name_label.Location = new System.Drawing.Point(229, 190);
             this.bg_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bg_name_label.Name = "bg_name_label";
             this.bg_name_label.Size = new System.Drawing.Size(112, 27);
@@ -214,7 +214,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(16, 49);
+            this.ms_sncode_label.Location = new System.Drawing.Point(10, 53);
             this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
@@ -227,7 +227,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             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(348, 51);
+            this.ms_makecode_label.Location = new System.Drawing.Point(295, 55);
             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(72, 27);
@@ -239,7 +239,7 @@
             this.mbr_brgcode_label.AutoSize = true;
             this.mbr_brgcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_brgcode_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_brgcode_label.Location = new System.Drawing.Point(235, 246);
+            this.mbr_brgcode_label.Location = new System.Drawing.Point(229, 246);
             this.mbr_brgcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbr_brgcode_label.Name = "mbr_brgcode_label";
             this.mbr_brgcode_label.Size = new System.Drawing.Size(112, 27);
@@ -251,7 +251,7 @@
             this.nr_name_label.AutoSize = true;
             this.nr_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_name_label.ForeColor = System.Drawing.Color.Black;
-            this.nr_name_label.Location = new System.Drawing.Point(611, 245);
+            this.nr_name_label.Location = new System.Drawing.Point(578, 245);
             this.nr_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.nr_name_label.Name = "nr_name_label";
             this.nr_name_label.Size = new System.Drawing.Size(92, 27);
@@ -263,7 +263,7 @@
             this.mbr_dutycode_label.AutoSize = true;
             this.mbr_dutycode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_dutycode_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_dutycode_label.Location = new System.Drawing.Point(988, 242);
+            this.mbr_dutycode_label.Location = new System.Drawing.Point(947, 242);
             this.mbr_dutycode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbr_dutycode_label.Name = "mbr_dutycode_label";
             this.mbr_dutycode_label.Size = new System.Drawing.Size(72, 27);
@@ -275,7 +275,7 @@
             this.mbc_component_label.AutoSize = true;
             this.mbc_component_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbc_component_label.ForeColor = System.Drawing.Color.Black;
-            this.mbc_component_label.Location = new System.Drawing.Point(235, 298);
+            this.mbc_component_label.Location = new System.Drawing.Point(229, 298);
             this.mbc_component_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbc_component_label.Name = "mbc_component_label";
             this.mbc_component_label.Size = new System.Drawing.Size(92, 27);
@@ -287,7 +287,7 @@
             this.mbr_solution_label.AutoSize = true;
             this.mbr_solution_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_solution_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_solution_label.Location = new System.Drawing.Point(611, 299);
+            this.mbr_solution_label.Location = new System.Drawing.Point(578, 299);
             this.mbr_solution_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbr_solution_label.Name = "mbr_solution_label";
             this.mbr_solution_label.Size = new System.Drawing.Size(92, 27);
@@ -299,7 +299,7 @@
             this.mbl_loc_label.AutoSize = true;
             this.mbl_loc_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbl_loc_label.ForeColor = System.Drawing.Color.Black;
-            this.mbl_loc_label.Location = new System.Drawing.Point(235, 372);
+            this.mbl_loc_label.Location = new System.Drawing.Point(229, 372);
             this.mbl_loc_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbl_loc_label.Name = "mbl_loc_label";
             this.mbl_loc_label.Size = new System.Drawing.Size(92, 27);
@@ -311,7 +311,7 @@
             this.mbp_part_label.AutoSize = true;
             this.mbp_part_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbp_part_label.ForeColor = System.Drawing.Color.Black;
-            this.mbp_part_label.Location = new System.Drawing.Point(641, 372);
+            this.mbp_part_label.Location = new System.Drawing.Point(617, 372);
             this.mbp_part_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbp_part_label.Name = "mbp_part_label";
             this.mbp_part_label.Size = new System.Drawing.Size(92, 27);
@@ -321,10 +321,10 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.panel1.Location = new System.Drawing.Point(217, 350);
+            this.panel1.Location = new System.Drawing.Point(211, 342);
             this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1105, 2);
+            this.panel1.Size = new System.Drawing.Size(1040, 1);
             this.panel1.TabIndex = 108;
             // 
             // GetSNCode_Label
@@ -333,7 +333,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode_Label.AutoSize = true;
             this.GetSNCode_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GetSNCode_Label.Location = new System.Drawing.Point(235, 679);
+            this.GetSNCode_Label.Location = new System.Drawing.Point(229, 679);
             this.GetSNCode_Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.GetSNCode_Label.Name = "GetSNCode_Label";
             this.GetSNCode_Label.Size = new System.Drawing.Size(72, 27);
@@ -345,7 +345,7 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(16, 159);
+            this.label2.Location = new System.Drawing.Point(10, 159);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 27);
@@ -358,13 +358,13 @@
             this.panel3.Location = new System.Drawing.Point(1, 146);
             this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1320, 2);
+            this.panel3.Size = new System.Drawing.Size(1250, 1);
             this.panel3.TabIndex = 109;
             // 
             // BadCodeTree
             // 
             this.BadCodeTree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BadCodeTree.Location = new System.Drawing.Point(21, 192);
+            this.BadCodeTree.Location = new System.Drawing.Point(15, 192);
             this.BadCodeTree.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.BadCodeTree.Name = "BadCodeTree";
             this.BadCodeTree.Size = new System.Drawing.Size(193, 532);
@@ -376,7 +376,7 @@
             this.bc_code.AutoSize = true;
             this.bc_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_code.ForeColor = System.Drawing.Color.Black;
-            this.bc_code.Location = new System.Drawing.Point(1264, 92);
+            this.bc_code.Location = new System.Drawing.Point(1226, 94);
             this.bc_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_code.Name = "bc_code";
             this.bc_code.Size = new System.Drawing.Size(0, 27);
@@ -388,7 +388,7 @@
             this.bg_code.AutoSize = true;
             this.bg_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bg_code.ForeColor = System.Drawing.Color.Black;
-            this.bg_code.Location = new System.Drawing.Point(1264, 51);
+            this.bg_code.Location = new System.Drawing.Point(1226, 53);
             this.bg_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bg_code.Name = "bg_code";
             this.bg_code.Size = new System.Drawing.Size(0, 27);
@@ -400,7 +400,7 @@
             this.nr_code.AutoSize = true;
             this.nr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_code.ForeColor = System.Drawing.Color.Black;
-            this.nr_code.Location = new System.Drawing.Point(1235, 92);
+            this.nr_code.Location = new System.Drawing.Point(1197, 94);
             this.nr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.nr_code.Name = "nr_code";
             this.nr_code.Size = new System.Drawing.Size(0, 27);
@@ -409,10 +409,10 @@
             // 
             // mb_badremark
             // 
-            this.mb_badremark.Location = new System.Drawing.Point(1096, 192);
-            this.mb_badremark.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.mb_badremark.Location = new System.Drawing.Point(1055, 192);
+            this.mb_badremark.Margin = new System.Windows.Forms.Padding(5);
             this.mb_badremark.Name = "mb_badremark";
-            this.mb_badremark.Size = new System.Drawing.Size(215, 26);
+            this.mb_badremark.Size = new System.Drawing.Size(186, 26);
             this.mb_badremark.TabIndex = 127;
             // 
             // ms_sncode
@@ -421,7 +421,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_sncode.AutoSize = true;
             this.ms_sncode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode.Location = new System.Drawing.Point(125, 51);
+            this.ms_sncode.Location = new System.Drawing.Point(119, 55);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Size = new System.Drawing.Size(0, 27);
@@ -434,13 +434,13 @@
             this.prodcode.Condition = null;
             this.prodcode.DBTitle = null;
             this.prodcode.FormName = null;
-            this.prodcode.Location = new System.Drawing.Point(747, 374);
+            this.prodcode.Location = new System.Drawing.Point(716, 373);
             this.prodcode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.prodcode.Name = "prodcode";
             this.prodcode.Power = null;
             this.prodcode.SelectField = null;
             this.prodcode.SetValueField = null;
-            this.prodcode.Size = new System.Drawing.Size(223, 26);
+            this.prodcode.Size = new System.Drawing.Size(183, 26);
             this.prodcode.TabIndex = 124;
             this.prodcode.TableName = null;
             this.prodcode.TextBoxEnable = true;
@@ -453,11 +453,11 @@
             this.mbp_partdgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.mbp_part1,
             this.mbp_id});
-            this.mbp_partdgv.Location = new System.Drawing.Point(647, 419);
+            this.mbp_partdgv.Location = new System.Drawing.Point(623, 419);
             this.mbp_partdgv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.mbp_partdgv.Name = "mbp_partdgv";
             this.mbp_partdgv.RowTemplate.Height = 27;
-            this.mbp_partdgv.Size = new System.Drawing.Size(371, 190);
+            this.mbp_partdgv.Size = new System.Drawing.Size(349, 190);
             this.mbp_partdgv.TabIndex = 121;
             // 
             // mbp_part1
@@ -482,11 +482,11 @@
             this.mbl_locdgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.mbl_loc1,
             this.mbl_id});
-            this.mbl_locdgv.Location = new System.Drawing.Point(240, 419);
+            this.mbl_locdgv.Location = new System.Drawing.Point(234, 419);
             this.mbl_locdgv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.mbl_locdgv.Name = "mbl_locdgv";
             this.mbl_locdgv.RowTemplate.Height = 27;
-            this.mbl_locdgv.Size = new System.Drawing.Size(371, 190);
+            this.mbl_locdgv.Size = new System.Drawing.Size(349, 190);
             this.mbl_locdgv.TabIndex = 120;
             // 
             // mbl_loc1
@@ -509,7 +509,7 @@
             this.RefreshTreeView.AllPower = null;
             this.RefreshTreeView.Cursor = System.Windows.Forms.Cursors.Hand;
             this.RefreshTreeView.Image = global::UAS_MES.Properties.Resources.refresh;
-            this.RefreshTreeView.Location = new System.Drawing.Point(119, 160);
+            this.RefreshTreeView.Location = new System.Drawing.Point(113, 160);
             this.RefreshTreeView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.RefreshTreeView.Name = "RefreshTreeView";
             this.RefreshTreeView.Power = null;
@@ -526,8 +526,8 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.ID = null;
-            this.GetSNCode.Location = new System.Drawing.Point(343, 680);
-            this.GetSNCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.GetSNCode.Location = new System.Drawing.Point(337, 680);
+            this.GetSNCode.Margin = new System.Windows.Forms.Padding(4);
             this.GetSNCode.Name = "GetSNCode";
             this.GetSNCode.Power = null;
             this.GetSNCode.Size = new System.Drawing.Size(249, 25);
@@ -545,8 +545,8 @@
             this.NewRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.DownImage")));
             this.NewRepairInf.Image = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.Image")));
             this.NewRepairInf.IsShowBorder = true;
-            this.NewRepairInf.Location = new System.Drawing.Point(385, 629);
-            this.NewRepairInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.NewRepairInf.Location = new System.Drawing.Point(379, 629);
+            this.NewRepairInf.Margin = new System.Windows.Forms.Padding(4);
             this.NewRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.MoveImage")));
             this.NewRepairInf.Name = "NewRepairInf";
             this.NewRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.NormalImage")));
@@ -565,8 +565,8 @@
             this.SaveRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.DownImage")));
             this.SaveRepairInf.Image = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.Image")));
             this.SaveRepairInf.IsShowBorder = true;
-            this.SaveRepairInf.Location = new System.Drawing.Point(536, 629);
-            this.SaveRepairInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SaveRepairInf.Location = new System.Drawing.Point(530, 629);
+            this.SaveRepairInf.Margin = new System.Windows.Forms.Padding(4);
             this.SaveRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.MoveImage")));
             this.SaveRepairInf.Name = "SaveRepairInf";
             this.SaveRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.NormalImage")));
@@ -585,8 +585,8 @@
             this.DeleteRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.DownImage")));
             this.DeleteRepairInf.Image = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.Image")));
             this.DeleteRepairInf.IsShowBorder = true;
-            this.DeleteRepairInf.Location = new System.Drawing.Point(688, 629);
-            this.DeleteRepairInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.DeleteRepairInf.Location = new System.Drawing.Point(682, 629);
+            this.DeleteRepairInf.Margin = new System.Windows.Forms.Padding(4);
             this.DeleteRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.MoveImage")));
             this.DeleteRepairInf.Name = "DeleteRepairInf";
             this.DeleteRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.NormalImage")));
@@ -605,11 +605,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.mbl_loc.BackColor = System.Drawing.Color.White;
             this.mbl_loc.ID = null;
-            this.mbl_loc.Location = new System.Drawing.Point(355, 374);
-            this.mbl_loc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.mbl_loc.Location = new System.Drawing.Point(349, 374);
+            this.mbl_loc.Margin = new System.Windows.Forms.Padding(4);
             this.mbl_loc.Name = "mbl_loc";
             this.mbl_loc.Power = null;
-            this.mbl_loc.Size = new System.Drawing.Size(187, 25);
+            this.mbl_loc.Size = new System.Drawing.Size(161, 25);
             this.mbl_loc.Str = null;
             this.mbl_loc.Str1 = null;
             this.mbl_loc.Str2 = null;
@@ -626,11 +626,11 @@
             this.mbr_solutioncode.BackColor = System.Drawing.Color.White;
             this.mbr_solutioncode.Enabled = false;
             this.mbr_solutioncode.ID = null;
-            this.mbr_solutioncode.Location = new System.Drawing.Point(747, 299);
-            this.mbr_solutioncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.mbr_solutioncode.Location = new System.Drawing.Point(714, 299);
+            this.mbr_solutioncode.Margin = new System.Windows.Forms.Padding(4);
             this.mbr_solutioncode.Name = "mbr_solutioncode";
             this.mbr_solutioncode.Power = null;
-            this.mbr_solutioncode.Size = new System.Drawing.Size(187, 25);
+            this.mbr_solutioncode.Size = new System.Drawing.Size(160, 25);
             this.mbr_solutioncode.Str = null;
             this.mbr_solutioncode.Str1 = null;
             this.mbr_solutioncode.Str2 = null;
@@ -645,11 +645,11 @@
             this.mbc_component.BackColor = System.Drawing.Color.White;
             this.mbc_component.Enabled = false;
             this.mbc_component.ID = null;
-            this.mbc_component.Location = new System.Drawing.Point(355, 299);
-            this.mbc_component.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.mbc_component.Location = new System.Drawing.Point(349, 299);
+            this.mbc_component.Margin = new System.Windows.Forms.Padding(4);
             this.mbc_component.Name = "mbc_component";
             this.mbc_component.Power = null;
-            this.mbc_component.Size = new System.Drawing.Size(187, 25);
+            this.mbc_component.Size = new System.Drawing.Size(160, 25);
             this.mbc_component.Str = null;
             this.mbc_component.Str1 = null;
             this.mbc_component.Str2 = null;
@@ -664,11 +664,11 @@
             this.mbr_dutycode.BackColor = System.Drawing.Color.White;
             this.mbr_dutycode.Enabled = false;
             this.mbr_dutycode.ID = null;
-            this.mbr_dutycode.Location = new System.Drawing.Point(1093, 248);
-            this.mbr_dutycode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.mbr_dutycode.Location = new System.Drawing.Point(1052, 248);
+            this.mbr_dutycode.Margin = new System.Windows.Forms.Padding(4);
             this.mbr_dutycode.Name = "mbr_dutycode";
             this.mbr_dutycode.Power = null;
-            this.mbr_dutycode.Size = new System.Drawing.Size(187, 25);
+            this.mbr_dutycode.Size = new System.Drawing.Size(160, 25);
             this.mbr_dutycode.Str = null;
             this.mbr_dutycode.Str1 = null;
             this.mbr_dutycode.Str2 = null;
@@ -683,11 +683,11 @@
             this.nr_name.BackColor = System.Drawing.Color.White;
             this.nr_name.Enabled = false;
             this.nr_name.ID = null;
-            this.nr_name.Location = new System.Drawing.Point(747, 245);
-            this.nr_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.nr_name.Location = new System.Drawing.Point(714, 245);
+            this.nr_name.Margin = new System.Windows.Forms.Padding(4);
             this.nr_name.Name = "nr_name";
             this.nr_name.Power = null;
-            this.nr_name.Size = new System.Drawing.Size(187, 25);
+            this.nr_name.Size = new System.Drawing.Size(160, 25);
             this.nr_name.Str = null;
             this.nr_name.Str1 = null;
             this.nr_name.Str2 = null;
@@ -703,11 +703,11 @@
             this.nrg_name.BackColor = System.Drawing.Color.White;
             this.nrg_name.Enabled = false;
             this.nrg_name.ID = null;
-            this.nrg_name.Location = new System.Drawing.Point(355, 248);
-            this.nrg_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.nrg_name.Location = new System.Drawing.Point(349, 248);
+            this.nrg_name.Margin = new System.Windows.Forms.Padding(4);
             this.nrg_name.Name = "nrg_name";
             this.nrg_name.Power = null;
-            this.nrg_name.Size = new System.Drawing.Size(187, 25);
+            this.nrg_name.Size = new System.Drawing.Size(160, 25);
             this.nrg_name.Str = null;
             this.nrg_name.Str1 = null;
             this.nrg_name.Str2 = null;
@@ -722,11 +722,11 @@
             this.bc_name.BackColor = System.Drawing.Color.White;
             this.bc_name.Enabled = false;
             this.bc_name.ID = null;
-            this.bc_name.Location = new System.Drawing.Point(747, 192);
-            this.bc_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bc_name.Location = new System.Drawing.Point(714, 192);
+            this.bc_name.Margin = new System.Windows.Forms.Padding(4);
             this.bc_name.Name = "bc_name";
             this.bc_name.Power = null;
-            this.bc_name.Size = new System.Drawing.Size(187, 25);
+            this.bc_name.Size = new System.Drawing.Size(160, 25);
             this.bc_name.Str = null;
             this.bc_name.Str1 = null;
             this.bc_name.Str2 = null;
@@ -742,11 +742,11 @@
             this.bg_name.Enabled = false;
             this.bg_name.ForeColor = System.Drawing.Color.Red;
             this.bg_name.ID = null;
-            this.bg_name.Location = new System.Drawing.Point(355, 192);
-            this.bg_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bg_name.Location = new System.Drawing.Point(349, 192);
+            this.bg_name.Margin = new System.Windows.Forms.Padding(4);
             this.bg_name.Name = "bg_name";
             this.bg_name.Power = null;
-            this.bg_name.Size = new System.Drawing.Size(187, 25);
+            this.bg_name.Size = new System.Drawing.Size(160, 25);
             this.bg_name.Str = null;
             this.bg_name.Str1 = null;
             this.bg_name.Str2 = null;
@@ -756,8 +756,8 @@
             // OperatResult
             // 
             this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperatResult.Location = new System.Drawing.Point(1060, 372);
-            this.OperatResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperatResult.Location = new System.Drawing.Point(989, 372);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperatResult.Name = "OperatResult";
             this.OperatResult.Size = new System.Drawing.Size(247, 318);
             this.OperatResult.TabIndex = 87;
@@ -769,7 +769,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             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(455, 51);
+            this.ms_makecode.Location = new System.Drawing.Point(402, 55);
             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);
@@ -781,7 +781,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_prodcode.AutoSize = true;
             this.ms_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode.Location = new System.Drawing.Point(749, 51);
+            this.ms_prodcode.Location = new System.Drawing.Point(696, 55);
             this.ms_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_prodcode.Name = "ms_prodcode";
             this.ms_prodcode.Size = new System.Drawing.Size(0, 27);
@@ -793,7 +793,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             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(1055, 51);
+            this.pr_detail.Location = new System.Drawing.Point(1002, 55);
             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);
@@ -806,8 +806,8 @@
             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(1145, 698);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Location = new System.Drawing.Point(1076, 698);
+            this.Clean.Margin = new System.Windows.Forms.Padding(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")));
@@ -828,13 +828,13 @@
             this.cd_stepcode.Condition = null;
             this.cd_stepcode.DBTitle = "回流工序";
             this.cd_stepcode.FormName = null;
-            this.cd_stepcode.Location = new System.Drawing.Point(535, 99);
-            this.cd_stepcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cd_stepcode.Location = new System.Drawing.Point(464, 104);
+            this.cd_stepcode.Margin = new System.Windows.Forms.Padding(4);
             this.cd_stepcode.Name = "cd_stepcode";
             this.cd_stepcode.Power = null;
             this.cd_stepcode.SelectField = null;
             this.cd_stepcode.SetValueField = null;
-            this.cd_stepcode.Size = new System.Drawing.Size(263, 26);
+            this.cd_stepcode.Size = new System.Drawing.Size(200, 26);
             this.cd_stepcode.TabIndex = 68;
             this.cd_stepcode.TableName = null;
             this.cd_stepcode.Tag = "ms_stepcode";
@@ -849,13 +849,13 @@
             this.cr_code.Condition = null;
             this.cr_code.DBTitle = "回流途程";
             this.cr_code.FormName = null;
-            this.cr_code.Location = new System.Drawing.Point(123, 99);
-            this.cr_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cr_code.Location = new System.Drawing.Point(121, 103);
+            this.cr_code.Margin = new System.Windows.Forms.Padding(4);
             this.cr_code.Name = "cr_code";
             this.cr_code.Power = null;
             this.cr_code.SelectField = null;
             this.cr_code.SetValueField = null;
-            this.cr_code.Size = new System.Drawing.Size(256, 26);
+            this.cr_code.Size = new System.Drawing.Size(200, 26);
             this.cr_code.TabIndex = 67;
             this.cr_code.TableName = null;
             this.cr_code.Tag = "ms_craftcode";
@@ -869,8 +869,8 @@
             this.NewBadCode.DownImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.DownImage")));
             this.NewBadCode.Image = ((System.Drawing.Image)(resources.GetObject("NewBadCode.Image")));
             this.NewBadCode.IsShowBorder = true;
-            this.NewBadCode.Location = new System.Drawing.Point(236, 629);
-            this.NewBadCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.NewBadCode.Location = new System.Drawing.Point(230, 629);
+            this.NewBadCode.Margin = new System.Windows.Forms.Padding(4);
             this.NewBadCode.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.MoveImage")));
             this.NewBadCode.Name = "NewBadCode";
             this.NewBadCode.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.NormalImage")));
@@ -890,8 +890,8 @@
             this.SaveBadLocation.Enabled = false;
             this.SaveBadLocation.Image = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.Image")));
             this.SaveBadLocation.IsShowBorder = true;
-            this.SaveBadLocation.Location = new System.Drawing.Point(549, 372);
-            this.SaveBadLocation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SaveBadLocation.Location = new System.Drawing.Point(522, 372);
+            this.SaveBadLocation.Margin = new System.Windows.Forms.Padding(4);
             this.SaveBadLocation.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.MoveImage")));
             this.SaveBadLocation.Name = "SaveBadLocation";
             this.SaveBadLocation.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.NormalImage")));
@@ -910,8 +910,8 @@
             this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
             this.Scrap.Image = ((System.Drawing.Image)(resources.GetObject("Scrap.Image")));
             this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(964, 95);
-            this.Scrap.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Scrap.Location = new System.Drawing.Point(830, 99);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(4);
             this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
             this.Scrap.Name = "Scrap";
             this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
@@ -930,8 +930,8 @@
             this.RepairComplete.DownImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.DownImage")));
             this.RepairComplete.Image = ((System.Drawing.Image)(resources.GetObject("RepairComplete.Image")));
             this.RepairComplete.IsShowBorder = true;
-            this.RepairComplete.Location = new System.Drawing.Point(837, 95);
-            this.RepairComplete.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.RepairComplete.Location = new System.Drawing.Point(703, 99);
+            this.RepairComplete.Margin = new System.Windows.Forms.Padding(4);
             this.RepairComplete.MoveImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.MoveImage")));
             this.RepairComplete.Name = "RepairComplete";
             this.RepairComplete.NormalImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.NormalImage")));
@@ -947,7 +947,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1327, 735);
+            this.ClientSize = new System.Drawing.Size(1256, 735);
             this.Controls.Add(this.mb_badremark);
             this.Controls.Add(this.ms_sncode);
             this.Controls.Add(this.nr_code);
@@ -1003,7 +1003,7 @@
             this.Controls.Add(this.ms_makecode_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.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_Repair";
             this.Tag = "Make!Repair";
             this.Text = "维修作业";

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

@@ -83,9 +83,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.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1229, 36);
+            this.panel2.Size = new System.Drawing.Size(1150, 36);
             this.panel2.TabIndex = 30;
             // 
             // label1
@@ -104,7 +104,7 @@
             // 
             this.bc_remark_label.AutoSize = true;
             this.bc_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_remark_label.Location = new System.Drawing.Point(447, 202);
+            this.bc_remark_label.Location = new System.Drawing.Point(386, 203);
             this.bc_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_remark_label.Name = "bc_remark_label";
             this.bc_remark_label.Size = new System.Drawing.Size(92, 27);
@@ -115,7 +115,7 @@
             // 
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(308, 652);
+            this.ms_sncode_label.Location = new System.Drawing.Point(288, 652);
             this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
@@ -126,7 +126,7 @@
             // 
             this.bc_groupcode_label.AutoSize = true;
             this.bc_groupcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_groupcode_label.Location = new System.Drawing.Point(27, 202);
+            this.bc_groupcode_label.Location = new System.Drawing.Point(7, 202);
             this.bc_groupcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_groupcode_label.Name = "bc_groupcode_label";
             this.bc_groupcode_label.Size = new System.Drawing.Size(92, 27);
@@ -138,7 +138,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.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(27, 154);
+            this.label2.Location = new System.Drawing.Point(7, 154);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 27);
@@ -149,7 +149,7 @@
             // 
             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(27, 252);
+            this.label3.Location = new System.Drawing.Point(7, 252);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
@@ -161,8 +161,8 @@
             this.GoodProduct.AutoSize = true;
             this.GoodProduct.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GoodProduct.ForeColor = System.Drawing.Color.Blue;
-            this.GoodProduct.Location = new System.Drawing.Point(31, 648);
-            this.GoodProduct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.GoodProduct.Location = new System.Drawing.Point(11, 648);
+            this.GoodProduct.Margin = new System.Windows.Forms.Padding(4);
             this.GoodProduct.Name = "GoodProduct";
             this.GoodProduct.Size = new System.Drawing.Size(83, 35);
             this.GoodProduct.TabIndex = 35;
@@ -176,8 +176,8 @@
             this.Reject.AutoSize = true;
             this.Reject.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Reject.ForeColor = System.Drawing.Color.Red;
-            this.Reject.Location = new System.Drawing.Point(141, 648);
-            this.Reject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Reject.Location = new System.Drawing.Point(121, 648);
+            this.Reject.Margin = new System.Windows.Forms.Padding(4);
             this.Reject.Name = "Reject";
             this.Reject.Size = new System.Drawing.Size(107, 35);
             this.Reject.TabIndex = 36;
@@ -194,10 +194,10 @@
             this.columnHeader1,
             this.columnHeader2});
             this.WaitRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WaitRejectList.Location = new System.Drawing.Point(29, 329);
-            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WaitRejectList.Location = new System.Drawing.Point(9, 329);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.WaitRejectList.Name = "WaitRejectList";
-            this.WaitRejectList.Size = new System.Drawing.Size(393, 304);
+            this.WaitRejectList.Size = new System.Drawing.Size(353, 304);
             this.WaitRejectList.TabIndex = 37;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
@@ -229,7 +229,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(27, 298);
+            this.label4.Location = new System.Drawing.Point(7, 298);
             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);
@@ -240,7 +240,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(541, 298);
+            this.label5.Location = new System.Drawing.Point(491, 298);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(92, 27);
@@ -251,7 +251,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(947, 172);
+            this.label6.Location = new System.Drawing.Point(858, 172);
             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);
@@ -267,10 +267,10 @@
             this.columnHeader7,
             this.columnHeader8});
             this.ChoosedRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChoosedRejectList.Location = new System.Drawing.Point(544, 329);
-            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChoosedRejectList.Location = new System.Drawing.Point(494, 329);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
-            this.ChoosedRejectList.Size = new System.Drawing.Size(393, 304);
+            this.ChoosedRejectList.Size = new System.Drawing.Size(353, 304);
             this.ChoosedRejectList.TabIndex = 50;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
@@ -290,7 +290,7 @@
             // 
             this.columnHeader7.Text = "不良代码";
             this.columnHeader7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader7.Width = 79;
+            this.columnHeader7.Width = 95;
             // 
             // columnHeader8
             // 
@@ -302,7 +302,7 @@
             // 
             this.AutoBadCode.AutoSize = true;
             this.AutoBadCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoBadCode.Location = new System.Drawing.Point(125, 301);
+            this.AutoBadCode.Location = new System.Drawing.Point(105, 301);
             this.AutoBadCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoBadCode.Name = "AutoBadCode";
             this.AutoBadCode.Size = new System.Drawing.Size(151, 24);
@@ -314,7 +314,7 @@
             // 
             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(27, 109);
+            this.ma_qty_label.Location = new System.Drawing.Point(7, 109);
             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(92, 27);
@@ -325,7 +325,7 @@
             // 
             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(447, 59);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(427, 59);
             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(92, 27);
@@ -336,7 +336,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(792, 59);
+            this.pr_detail_label.Location = new System.Drawing.Point(769, 59);
             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);
@@ -347,7 +347,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(27, 59);
+            this.ms_makecode_label.Location = new System.Drawing.Point(7, 59);
             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);
@@ -358,7 +358,7 @@
             // 
             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(447, 109);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(427, 109);
             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(92, 27);
@@ -369,7 +369,7 @@
             // 
             this.mc_restqty_label.AutoSize = true;
             this.mc_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mc_restqty_label.Location = new System.Drawing.Point(792, 109);
+            this.mc_restqty_label.Location = new System.Drawing.Point(769, 109);
             this.mc_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mc_restqty_label.Name = "mc_restqty_label";
             this.mc_restqty_label.Size = new System.Drawing.Size(92, 27);
@@ -383,7 +383,7 @@
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.Image = null;
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(705, 650);
+            this.Save.Location = new System.Drawing.Point(685, 650);
             this.Save.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
@@ -401,11 +401,11 @@
             this.bc_code.BackColor = System.Drawing.Color.White;
             this.bc_code.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_code.ID = null;
-            this.bc_code.Location = new System.Drawing.Point(148, 252);
-            this.bc_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bc_code.Location = new System.Drawing.Point(128, 252);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(4);
             this.bc_code.Name = "bc_code";
             this.bc_code.Power = null;
-            this.bc_code.Size = new System.Drawing.Size(251, 28);
+            this.bc_code.Size = new System.Drawing.Size(234, 28);
             this.bc_code.Str = null;
             this.bc_code.Str1 = null;
             this.bc_code.Str2 = null;
@@ -419,8 +419,8 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(147, 59);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ma_code.Location = new System.Drawing.Point(127, 59);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
@@ -436,7 +436,7 @@
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(361, 60);
+            this.LockMakeCode.Location = new System.Drawing.Point(341, 60);
             this.LockMakeCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LockMakeCode.Name = "LockMakeCode";
             this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
@@ -448,7 +448,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(915, 109);
+            this.mcd_remainqty.Location = new System.Drawing.Point(892, 109);
             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, 27);
@@ -459,7 +459,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(915, 59);
+            this.pr_detail.Location = new System.Drawing.Point(892, 59);
             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);
@@ -469,7 +469,7 @@
             // 
             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(149, 109);
+            this.ma_qty.Location = new System.Drawing.Point(129, 109);
             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, 27);
@@ -479,7 +479,7 @@
             // 
             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(571, 109);
+            this.mcd_inqty.Location = new System.Drawing.Point(549, 109);
             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, 27);
@@ -490,7 +490,7 @@
             // 
             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(571, 59);
+            this.ma_prodcode.Location = new System.Drawing.Point(549, 59);
             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, 27);
@@ -500,8 +500,8 @@
             // 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(951, 202);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Location = new System.Drawing.Point(862, 202);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(275, 430);
             this.OperateResult.TabIndex = 52;
@@ -514,8 +514,8 @@
             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(1048, 648);
-            this.CleanInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.CleanInfo.Location = new System.Drawing.Point(959, 650);
+            this.CleanInfo.Margin = new System.Windows.Forms.Padding(4);
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
             this.CleanInfo.NormalImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.NormalImage")));
@@ -529,8 +529,8 @@
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
-            this.ChooseedReject.Location = new System.Drawing.Point(452, 439);
-            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChooseedReject.Location = new System.Drawing.Point(393, 439);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseedReject.Name = "ChooseedReject";
             this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
             this.ChooseedReject.TabIndex = 45;
@@ -540,8 +540,8 @@
             // WaitReject
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
-            this.WaitReject.Location = new System.Drawing.Point(452, 518);
-            this.WaitReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WaitReject.Location = new System.Drawing.Point(393, 518);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(4);
             this.WaitReject.Name = "WaitReject";
             this.WaitReject.Size = new System.Drawing.Size(67, 29);
             this.WaitReject.TabIndex = 44;
@@ -553,12 +553,12 @@
             this.bc_remark.AllPower = null;
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.ID = null;
-            this.bc_remark.Location = new System.Drawing.Point(547, 204);
-            this.bc_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bc_remark.Location = new System.Drawing.Point(497, 204);
+            this.bc_remark.Margin = new System.Windows.Forms.Padding(4);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
-            this.bc_remark.Size = new System.Drawing.Size(393, 76);
+            this.bc_remark.Size = new System.Drawing.Size(350, 76);
             this.bc_remark.Str = null;
             this.bc_remark.Str1 = null;
             this.bc_remark.Str2 = null;
@@ -568,10 +568,10 @@
             // 
             this.bc_groupcode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_groupcode.FormattingEnabled = true;
-            this.bc_groupcode.Location = new System.Drawing.Point(148, 204);
-            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bc_groupcode.Location = new System.Drawing.Point(128, 204);
+            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4);
             this.bc_groupcode.Name = "bc_groupcode";
-            this.bc_groupcode.Size = new System.Drawing.Size(251, 26);
+            this.bc_groupcode.Size = new System.Drawing.Size(234, 26);
             this.bc_groupcode.TabIndex = 21;
             this.bc_groupcode.SelectedIndexChanged += new System.EventHandler(this.bc_groupcode_SelectedIndexChanged);
             // 
@@ -581,8 +581,8 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(423, 652);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ms_sncode.Location = new System.Drawing.Point(403, 652);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
             this.ms_sncode.Size = new System.Drawing.Size(240, 28);
@@ -598,7 +598,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(1229, 700);
+            this.ClientSize = new System.Drawing.Size(1150, 700);
             this.Controls.Add(this.Save);
             this.Controls.Add(this.AutoBadCode);
             this.Controls.Add(this.bc_code);
@@ -637,7 +637,7 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -207,7 +207,7 @@ namespace UAS_MES.OQC
                         //执行批量更新的SQL
                         if (ois_id_update.Count > 0)
                         {
-                            dh.BatchInsert("update OQCItemSamples set ois_ifng=:ois_ifng,ois_defectlevel=:ois_defectlevel,ois_remark=:ois_remark where ois_id=:ois_id",
+                            dh.BatchInsert("update OQCItemSamples set ois_ifng=:ois_ifng,ois_defectlevel=:ois_defectlevel,ois_remark=:ois_remark,ois_indate=sysdate where ois_id=:ois_id",
                          new string[] { "ois_ifng", "ois_defectlevel", "ois_remark", "ois_id" }, ois_ifng_update.ToArray(), ois_defectlevel_update.ToArray(), ois_remark_update.ToArray(), ois_id_update.ToArray());
                         }
                         //如果主键为空,并且存在需要插入的数据则执行插入操作 
@@ -221,8 +221,8 @@ namespace UAS_MES.OQC
                             sql.Clear();
                             sql.Append("insert when (not exists (select ois_id from OQCItemSamples where ois_checkno='" + ob_checkno.Text + "' and ois_sncode='" + sncode.Text + "' and ois_itemcode =:ois_itemcode)) then ");
                             sql.Append("into OQCItemSamples (ois_id,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
-                            sql.Append("ois_ifng,ois_defectlevel,ois_remark)select :id,'" + ob_checkno.Text + "',");
-                            sql.Append("'" + ob_makecode.Text + "','" + sncode.Text + "','" + ob_projectcode.Text + "',:ois_itemcode,:ois_ifng,:ois_defectlevel,:ois_remark from dual");
+                            sql.Append("ois_ifng,ois_defectlevel,ois_remark,ois_indate)select :id,'" + ob_checkno.Text + "',");
+                            sql.Append("'" + ob_makecode.Text + "','" + sncode.Text + "','" + ob_projectcode.Text + "',:ois_itemcode,:ois_ifng,:ois_defectlevel,:ois_remark,sysdate from dual");
                             dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "id", "ois_itemcode", "ois_ifng", "ois_defectlevel", "ois_remark" },
                                  oi_itemcode_insert.ToArray(), id, oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), ois_defectlevel_insert.ToArray(), ois_remark_insert.ToArray());
                         }

UAS-MES/Main.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES
+ namespace UAS_MES
 {
     partial class Main
     {
@@ -75,11 +75,11 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.MainTabControl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.MainTabControl.ItemSize = new System.Drawing.Size(96, 25);
-            this.MainTabControl.Location = new System.Drawing.Point(181, 40);
+            this.MainTabControl.Location = new System.Drawing.Point(156, 40);
             this.MainTabControl.Margin = new System.Windows.Forms.Padding(4);
             this.MainTabControl.Name = "MainTabControl";
             this.MainTabControl.SelectedIndex = 0;
-            this.MainTabControl.Size = new System.Drawing.Size(1096, 700);
+            this.MainTabControl.Size = new System.Drawing.Size(1121, 700);
             this.MainTabControl.TabIndex = 7;
             this.MainTabControl.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.MainTabControl_ControlRemoved);
             // 
@@ -87,11 +87,11 @@
             // 
             this.name_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.name_label.AutoSize = true;
-            this.name_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.name_label.Location = new System.Drawing.Point(8, 4);
+            this.name_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.name_label.Location = new System.Drawing.Point(8, 8);
             this.name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.name_label.Name = "name_label";
-            this.name_label.Size = new System.Drawing.Size(50, 24);
+            this.name_label.Size = new System.Drawing.Size(43, 20);
             this.name_label.TabIndex = 4;
             this.name_label.Text = "姓名:";
             // 
@@ -118,22 +118,22 @@
             // 
             this.inf_currentstep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_currentstep.AutoSize = true;
-            this.inf_currentstep.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_currentstep.Location = new System.Drawing.Point(308, 6);
+            this.inf_currentstep.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.inf_currentstep.Location = new System.Drawing.Point(304, 10);
             this.inf_currentstep.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_currentstep.Name = "inf_currentstep";
-            this.inf_currentstep.Size = new System.Drawing.Size(0, 24);
+            this.inf_currentstep.Size = new System.Drawing.Size(0, 20);
             this.inf_currentstep.TabIndex = 15;
             // 
             // step_label
             // 
             this.step_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.step_label.AutoSize = true;
-            this.step_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.step_label.Location = new System.Drawing.Point(200, 6);
+            this.step_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.step_label.Location = new System.Drawing.Point(196, 10);
             this.step_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.step_label.Name = "step_label";
-            this.step_label.Size = new System.Drawing.Size(86, 24);
+            this.step_label.Size = new System.Drawing.Size(73, 20);
             this.step_label.TabIndex = 14;
             this.step_label.Text = "岗位工序:";
             // 
@@ -141,55 +141,55 @@
             // 
             this.inf_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_name.AutoSize = true;
-            this.inf_name.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_name.Location = new System.Drawing.Point(85, 4);
+            this.inf_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.inf_name.Location = new System.Drawing.Point(85, 8);
             this.inf_name.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_name.Name = "inf_name";
-            this.inf_name.Size = new System.Drawing.Size(0, 24);
+            this.inf_name.Size = new System.Drawing.Size(0, 20);
             this.inf_name.TabIndex = 13;
             // 
             // Inf_linecode
             // 
             this.Inf_linecode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode.AutoSize = true;
-            this.Inf_linecode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode.Location = new System.Drawing.Point(561, 5);
+            this.Inf_linecode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Inf_linecode.Location = new System.Drawing.Point(542, 9);
             this.Inf_linecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode.Name = "Inf_linecode";
-            this.Inf_linecode.Size = new System.Drawing.Size(0, 24);
+            this.Inf_linecode.Size = new System.Drawing.Size(0, 20);
             this.Inf_linecode.TabIndex = 11;
             // 
             // inf_source
             // 
             this.inf_source.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_source.AutoSize = true;
-            this.inf_source.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_source.Location = new System.Drawing.Point(796, 5);
+            this.inf_source.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.inf_source.Location = new System.Drawing.Point(753, 9);
             this.inf_source.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_source.Name = "inf_source";
-            this.inf_source.Size = new System.Drawing.Size(0, 24);
+            this.inf_source.Size = new System.Drawing.Size(0, 20);
             this.inf_source.TabIndex = 10;
             // 
             // inf_db
             // 
             this.inf_db.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_db.AutoSize = true;
-            this.inf_db.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_db.Location = new System.Drawing.Point(1090, 5);
+            this.inf_db.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.inf_db.Location = new System.Drawing.Point(1030, 9);
             this.inf_db.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_db.Name = "inf_db";
-            this.inf_db.Size = new System.Drawing.Size(0, 24);
+            this.inf_db.Size = new System.Drawing.Size(0, 20);
             this.inf_db.TabIndex = 9;
             // 
             // Inf_linecode_label
             // 
             this.Inf_linecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode_label.AutoSize = true;
-            this.Inf_linecode_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode_label.Location = new System.Drawing.Point(480, 5);
+            this.Inf_linecode_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Inf_linecode_label.Location = new System.Drawing.Point(461, 9);
             this.Inf_linecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode_label.Name = "Inf_linecode_label";
-            this.Inf_linecode_label.Size = new System.Drawing.Size(50, 24);
+            this.Inf_linecode_label.Size = new System.Drawing.Size(43, 20);
             this.Inf_linecode_label.TabIndex = 8;
             this.Inf_linecode_label.Text = "线别:";
             // 
@@ -197,11 +197,11 @@
             // 
             this.db_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.db_label.AutoSize = true;
-            this.db_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.db_label.Location = new System.Drawing.Point(995, 5);
+            this.db_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.db_label.Location = new System.Drawing.Point(935, 9);
             this.db_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.db_label.Name = "db_label";
-            this.db_label.Size = new System.Drawing.Size(68, 24);
+            this.db_label.Size = new System.Drawing.Size(58, 20);
             this.db_label.TabIndex = 7;
             this.db_label.Text = "数据库:";
             // 
@@ -209,11 +209,11 @@
             // 
             this.Inf_source_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_source_label.AutoSize = true;
-            this.Inf_source_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_source_label.Location = new System.Drawing.Point(716, 5);
+            this.Inf_source_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Inf_source_label.Location = new System.Drawing.Point(673, 9);
             this.Inf_source_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_source_label.Name = "Inf_source_label";
-            this.Inf_source_label.Size = new System.Drawing.Size(50, 24);
+            this.Inf_source_label.Size = new System.Drawing.Size(43, 20);
             this.Inf_source_label.TabIndex = 6;
             this.Inf_source_label.Text = "资源:";
             // 
@@ -244,7 +244,7 @@
             this.panel1.Location = new System.Drawing.Point(0, 40);
             this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(179, 702);
+            this.panel1.Size = new System.Drawing.Size(155, 702);
             this.panel1.TabIndex = 1;
             // 
             // Menu
@@ -253,7 +253,7 @@
             this.Menu.Location = new System.Drawing.Point(0, 0);
             this.Menu.Margin = new System.Windows.Forms.Padding(5);
             this.Menu.Name = "Menu";
-            this.Menu.Size = new System.Drawing.Size(177, 700);
+            this.Menu.Size = new System.Drawing.Size(153, 700);
             this.Menu.TabIndex = 3;
             // 
             // notifyIcon1
@@ -281,6 +281,7 @@
             this.headBar1.Name = "headBar1";
             this.headBar1.Size = new System.Drawing.Size(1277, 40);
             this.headBar1.TabIndex = 0;
+            this.headBar1.Title = null;
             // 
             // Main
             // 

UAS-MES/Properties/Settings.Designer.cs

@@ -85,9 +85,9 @@ namespace UAS_MES.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Password=select!#%*(;User ID=UAS_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDR" +
-            "ESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=" +
-            "(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_" +
+            "LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SER" +
+            "VER=DEDICATED)(SERVICE_NAME=orcl)));")]
         public string MES {
             get {
                 return ((string)(this["MES"]));

UAS-MES/Properties/Settings.settings

@@ -18,7 +18,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="MES" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Password=select!#%*(;User ID=UAS_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
+      <Value Profile="(Default)">Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
     </Setting>
     <Setting Name="DefaultCollectionValue" Type="System.String" Scope="User">
       <Value Profile="(Default)">DefaultValue</Value>

UAS-MES/UAS-MES.csproj

@@ -32,15 +32,16 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <UpdateUrl>http://218.17.158.219:8888/publish.htm/</UpdateUrl>
+    <UpdateUrl>http://172.16.11.99/</UpdateUrl>
     <TargetCulture>zh</TargetCulture>
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
+    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>267</ApplicationRevision>
+    <ApplicationRevision>274</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -69,7 +70,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>0702B5BD480611CA32663309A8FD3717B722E307</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>4FA99E585616700DE7B55D9E1B52AECEA80A31C9</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestKeyFile>