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

UAS-MES/App.config

@@ -24,9 +24,6 @@
       <setting name="LastLoginUser" serializeAs="String">
         <value />
       </setting>
-      <setting name="FTPAddress" serializeAs="String">
-        <value>ftp://192.168.253.9/MESSetting/|mesconfig|Administrator1@#</value>
-      </setting>
       <setting name="LastLoginSob" serializeAs="String">
         <value />
       </setting>
@@ -42,6 +39,9 @@
       <setting name="BaudRate" serializeAs="String">
         <value />
       </setting>
+      <setting name="FTPAddress" serializeAs="String">
+        <value>ftp://172.16.11.99/print/|uasmes|Administrator1@#</value>
+      </setting>
     </UAS_MES.Properties.Settings>
   </userSettings>
   <applicationSettings>

UAS-MES/FunctionCode/Employee/Employee_Data.Designer.cs

@@ -66,7 +66,7 @@
             this.Employee.Margin = new System.Windows.Forms.Padding(4);
             this.Employee.Name = "Employee";
             this.Employee.RowTemplate.Height = 23;
-            this.Employee.Size = new System.Drawing.Size(1416, 644);
+            this.Employee.Size = new System.Drawing.Size(1243, 644);
             this.Employee.TabIndex = 0;
             // 
             // em_code
@@ -125,7 +125,7 @@
             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(1323, 24);
+            this.Screen.Location = new System.Drawing.Point(1149, 23);
             this.Screen.Margin = new System.Windows.Forms.Padding(4);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
@@ -142,11 +142,11 @@
             this.em_code11.AllPower = null;
             this.em_code11.BackColor = System.Drawing.Color.White;
             this.em_code11.ID = null;
-            this.em_code11.Location = new System.Drawing.Point(452, 26);
+            this.em_code11.Location = new System.Drawing.Point(392, 25);
             this.em_code11.Margin = new System.Windows.Forms.Padding(4);
             this.em_code11.Name = "em_code11";
             this.em_code11.Power = null;
-            this.em_code11.Size = new System.Drawing.Size(199, 25);
+            this.em_code11.Size = new System.Drawing.Size(150, 25);
             this.em_code11.Str = null;
             this.em_code11.Str1 = null;
             this.em_code11.Str2 = null;
@@ -158,11 +158,11 @@
             this.em_name11.AllPower = null;
             this.em_name11.BackColor = System.Drawing.Color.White;
             this.em_name11.ID = null;
-            this.em_name11.Location = new System.Drawing.Point(124, 26);
+            this.em_name11.Location = new System.Drawing.Point(112, 25);
             this.em_name11.Margin = new System.Windows.Forms.Padding(4);
             this.em_name11.Name = "em_name11";
             this.em_name11.Power = null;
-            this.em_name11.Size = new System.Drawing.Size(199, 25);
+            this.em_name11.Size = new System.Drawing.Size(150, 25);
             this.em_name11.Str = null;
             this.em_name11.Str1 = null;
             this.em_name11.Str2 = null;
@@ -173,7 +173,7 @@
             // 
             this.em_name_label.AutoSize = true;
             this.em_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_name_label.Location = new System.Drawing.Point(20, 26);
+            this.em_name_label.Location = new System.Drawing.Point(8, 26);
             this.em_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_name_label.Name = "em_name_label";
             this.em_name_label.Size = new System.Drawing.Size(92, 27);
@@ -184,7 +184,7 @@
             // 
             this.em_code_label.AutoSize = true;
             this.em_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code_label.Location = new System.Drawing.Point(345, 26);
+            this.em_code_label.Location = new System.Drawing.Point(285, 25);
             this.em_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_code_label.Name = "em_code_label";
             this.em_code_label.Size = new System.Drawing.Size(92, 27);
@@ -200,7 +200,7 @@
             this.pagination1.Location = new System.Drawing.Point(0, 721);
             this.pagination1.Margin = new System.Windows.Forms.Padding(5);
             this.pagination1.Name = "pagination1";
-            this.pagination1.Size = new System.Drawing.Size(1420, 40);
+            this.pagination1.Size = new System.Drawing.Size(1245, 40);
             this.pagination1.TabIndex = 238;
             // 
             // em_depart1
@@ -208,11 +208,11 @@
             this.em_depart1.AllPower = null;
             this.em_depart1.BackColor = System.Drawing.Color.White;
             this.em_depart1.ID = null;
-            this.em_depart1.Location = new System.Drawing.Point(773, 26);
+            this.em_depart1.Location = new System.Drawing.Point(675, 25);
             this.em_depart1.Margin = new System.Windows.Forms.Padding(4);
             this.em_depart1.Name = "em_depart1";
             this.em_depart1.Power = null;
-            this.em_depart1.Size = new System.Drawing.Size(199, 25);
+            this.em_depart1.Size = new System.Drawing.Size(150, 25);
             this.em_depart1.Str = null;
             this.em_depart1.Str1 = null;
             this.em_depart1.Str2 = null;
@@ -223,7 +223,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(667, 26);
+            this.label1.Location = new System.Drawing.Point(569, 23);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
@@ -235,11 +235,11 @@
             this.em_position1.AllPower = null;
             this.em_position1.BackColor = System.Drawing.Color.White;
             this.em_position1.ID = null;
-            this.em_position1.Location = new System.Drawing.Point(1096, 25);
+            this.em_position1.Location = new System.Drawing.Point(960, 25);
             this.em_position1.Margin = new System.Windows.Forms.Padding(4);
             this.em_position1.Name = "em_position1";
             this.em_position1.Power = null;
-            this.em_position1.Size = new System.Drawing.Size(199, 25);
+            this.em_position1.Size = new System.Drawing.Size(150, 25);
             this.em_position1.Str = null;
             this.em_position1.Str1 = null;
             this.em_position1.Str2 = null;
@@ -250,18 +250,18 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(989, 25);
+            this.label2.Location = new System.Drawing.Point(853, 25);
             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);
             this.label2.TabIndex = 241;
             this.label2.Text = "员工岗位";
             // 
-            // 人员资料
+            // Employee_Data
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1420, 761);
+            this.ClientSize = new System.Drawing.Size(1245, 761);
             this.Controls.Add(this.em_position1);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.em_depart1);
@@ -275,7 +275,7 @@
             this.Controls.Add(this.Employee);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(4);
-            this.Name = "人员资料";
+            this.Name = "Employee_Data";
             this.Tag = "Employee!Group";
             this.Text = "人员分组";
             this.Load += new System.EventHandler(this.人员分组_Load);

UAS-MES/FunctionCode/Employee/Employee_Group.cs

@@ -47,12 +47,12 @@ namespace UAS_MES.Employee
 
             ug_code1.KeyDown += KeyDownEvent;
             ug_name1.KeyDown += KeyDownEvent;
-            //asc.controllInitializeSize(this);
+            asc.controllInitializeSize(this);
         }
 
         private void 人员分组_SizeChanged(object sender, EventArgs e)
         {
-            //asc.controlAutoSize(this);
+            asc.controlAutoSize(this);
         }
 
         private void Screen_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Employee/Employee_NewGroup.Designer.cs

@@ -45,8 +45,9 @@
             this.headBar1.Location = new System.Drawing.Point(0, 0);
             this.headBar1.Margin = new System.Windows.Forms.Padding(4);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(463, 40);
+            this.headBar1.Size = new System.Drawing.Size(439, 40);
             this.headBar1.TabIndex = 0;
+            this.headBar1.Title = null;
             // 
             // ProductName
             // 
@@ -65,7 +66,7 @@
             // 
             this.ug_code_label.AutoSize = true;
             this.ug_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_label.Location = new System.Drawing.Point(34, 88);
+            this.ug_code_label.Location = new System.Drawing.Point(22, 88);
             this.ug_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_code_label.Name = "ug_code_label";
             this.ug_code_label.Size = new System.Drawing.Size(112, 27);
@@ -76,7 +77,7 @@
             // 
             this.ug_name_label.AutoSize = true;
             this.ug_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_label.Location = new System.Drawing.Point(34, 148);
+            this.ug_name_label.Location = new System.Drawing.Point(22, 148);
             this.ug_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_name_label.Name = "ug_name_label";
             this.ug_name_label.Size = new System.Drawing.Size(112, 27);
@@ -91,12 +92,12 @@
             this.SaveGroup.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SaveGroup.Image = null;
             this.SaveGroup.IsShowBorder = true;
-            this.SaveGroup.Location = new System.Drawing.Point(194, 212);
+            this.SaveGroup.Location = new System.Drawing.Point(191, 212);
             this.SaveGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveGroup.MoveImage")));
             this.SaveGroup.Name = "SaveGroup";
             this.SaveGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveGroup.NormalImage")));
             this.SaveGroup.Power = null;
-            this.SaveGroup.Size = new System.Drawing.Size(75, 39);
+            this.SaveGroup.Size = new System.Drawing.Size(60, 30);
             this.SaveGroup.TabIndex = 16;
             this.SaveGroup.Text = "保存";
             this.SaveGroup.UseVisualStyleBackColor = false;
@@ -107,7 +108,7 @@
             this.ug_code.AllPower = null;
             this.ug_code.BackColor = System.Drawing.Color.White;
             this.ug_code.ID = null;
-            this.ug_code.Location = new System.Drawing.Point(182, 88);
+            this.ug_code.Location = new System.Drawing.Point(170, 88);
             this.ug_code.Name = "ug_code";
             this.ug_code.Power = null;
             this.ug_code.Size = new System.Drawing.Size(235, 25);
@@ -121,7 +122,7 @@
             this.ug_name.AllPower = null;
             this.ug_name.BackColor = System.Drawing.Color.White;
             this.ug_name.ID = null;
-            this.ug_name.Location = new System.Drawing.Point(182, 148);
+            this.ug_name.Location = new System.Drawing.Point(170, 148);
             this.ug_name.Name = "ug_name";
             this.ug_name.Power = null;
             this.ug_name.Size = new System.Drawing.Size(235, 25);
@@ -130,11 +131,11 @@
             this.ug_name.Str2 = null;
             this.ug_name.TabIndex = 18;
             // 
-            // 新增分组
+            // Employee_NewGroup
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(463, 283);
+            this.ClientSize = new System.Drawing.Size(439, 266);
             this.Controls.Add(this.ug_name);
             this.Controls.Add(this.ug_code);
             this.Controls.Add(this.SaveGroup);
@@ -143,7 +144,7 @@
             this.Controls.Add(this.ProductName);
             this.Controls.Add(this.headBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "新增分组";
+            this.Name = "Employee_NewGroup";
             this.Tag = "ShowDialogWindow";
             this.Text = "新增分组";
             this.Load += new System.EventHandler(this.新增分组_Load);

UAS-MES/FunctionCode/Employee/Employee_Power.Designer.cs

@@ -125,7 +125,7 @@
             this.SavePower.DownImage = ((System.Drawing.Image)(resources.GetObject("SavePower.DownImage")));
             this.SavePower.Image = ((System.Drawing.Image)(resources.GetObject("SavePower.Image")));
             this.SavePower.IsShowBorder = true;
-            this.SavePower.Location = new System.Drawing.Point(537, 571);
+            this.SavePower.Location = new System.Drawing.Point(484, 575);
             this.SavePower.Margin = new System.Windows.Forms.Padding(4);
             this.SavePower.MoveImage = ((System.Drawing.Image)(resources.GetObject("SavePower.MoveImage")));
             this.SavePower.Name = "SavePower";
@@ -153,7 +153,7 @@
             this.GroupPowerDGV.Margin = new System.Windows.Forms.Padding(4);
             this.GroupPowerDGV.Name = "GroupPowerDGV";
             this.GroupPowerDGV.RowTemplate.Height = 23;
-            this.GroupPowerDGV.Size = new System.Drawing.Size(1140, 500);
+            this.GroupPowerDGV.Size = new System.Drawing.Size(1038, 500);
             this.GroupPowerDGV.TabIndex = 0;
             this.GroupPowerDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.GroupPower_DataError);
             // 
@@ -198,7 +198,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1149, 619);
+            this.ClientSize = new System.Drawing.Size(1045, 619);
             this.Controls.Add(this.sn_module);
             this.Controls.Add(this.ug_code);
             this.Controls.Add(this.Screen);

UAS-MES/FunctionCode/Employee/Employee_PowerSarch.Designer.cs

@@ -106,7 +106,7 @@
             this.PowerSearchDGV.Name = "PowerSearchDGV";
             this.PowerSearchDGV.ReadOnly = true;
             this.PowerSearchDGV.RowTemplate.Height = 23;
-            this.PowerSearchDGV.Size = new System.Drawing.Size(1195, 606);
+            this.PowerSearchDGV.Size = new System.Drawing.Size(1089, 606);
             this.PowerSearchDGV.TabIndex = 220;
             // 
             // ug_group
@@ -239,7 +239,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1197, 698);
+            this.ClientSize = new System.Drawing.Size(1093, 698);
             this.Controls.Add(this.PowerSearchDGV);
             this.Controls.Add(this.Screen);
             this.Controls.Add(this.ug_code);

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

@@ -83,29 +83,32 @@
             // ma_code_label
             // 
             this.ma_code_label.AutoSize = true;
-            this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(31, 242);
+            this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_code_label.Location = new System.Drawing.Point(41, 302);
+            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(96, 28);
+            this.ma_code_label.Size = new System.Drawing.Size(115, 32);
             this.ma_code_label.TabIndex = 97;
             this.ma_code_label.Text = "制造单号";
             // 
             // mcd_okqty
             // 
             this.mcd_okqty.AutoSize = true;
-            this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(105, 482);
+            this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_okqty.Location = new System.Drawing.Point(140, 609);
+            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(0, 28);
+            this.mcd_okqty.Size = new System.Drawing.Size(0, 32);
             this.mcd_okqty.TabIndex = 94;
             // 
             // mcd_okqty_label
             // 
             this.mcd_okqty_label.AutoSize = true;
-            this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(31, 482);
+            this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_okqty_label.Location = new System.Drawing.Point(41, 609);
+            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(59, 28);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(71, 32);
             this.mcd_okqty_label.TabIndex = 92;
             this.mcd_okqty_label.Text = "已称:";
             // 
@@ -116,28 +119,31 @@
             this.panel6.Controls.Add(this.pr_code);
             this.panel6.Controls.Add(this.pr_cartongw_label);
             this.panel6.Controls.Add(this.pr_code_label);
-            this.panel6.Location = new System.Drawing.Point(466, 76);
+            this.panel6.Location = new System.Drawing.Point(562, 95);
+            this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(452, 125);
+            this.panel6.Size = new System.Drawing.Size(537, 156);
             this.panel6.TabIndex = 90;
             // 
             // pr_cartongw
             // 
             this.pr_cartongw.AutoSize = true;
-            this.pr_cartongw.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartongw.Location = new System.Drawing.Point(176, 72);
+            this.pr_cartongw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_cartongw.Location = new System.Drawing.Point(205, 91);
+            this.pr_cartongw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartongw.Name = "pr_cartongw";
-            this.pr_cartongw.Size = new System.Drawing.Size(0, 31);
+            this.pr_cartongw.Size = new System.Drawing.Size(0, 32);
             this.pr_cartongw.TabIndex = 80;
             this.pr_cartongw.Tag = "1";
             // 
             // pr_code
             // 
             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(176, 21);
+            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_code.Location = new System.Drawing.Point(205, 27);
+            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, 31);
+            this.pr_code.Size = new System.Drawing.Size(0, 32);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
@@ -145,20 +151,22 @@
             // pr_cartongw_label
             // 
             this.pr_cartongw_label.AutoSize = true;
-            this.pr_cartongw_label.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartongw_label.Location = new System.Drawing.Point(35, 72);
+            this.pr_cartongw_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_cartongw_label.Location = new System.Drawing.Point(38, 91);
+            this.pr_cartongw_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartongw_label.Name = "pr_cartongw_label";
-            this.pr_cartongw_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_cartongw_label.Size = new System.Drawing.Size(115, 32);
             this.pr_cartongw_label.TabIndex = 42;
             this.pr_cartongw_label.Text = "标准重量";
             // 
             // pr_code_label
             // 
             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(34, 21);
+            this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_code_label.Location = new System.Drawing.Point(36, 27);
+            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(110, 31);
+            this.pr_code_label.Size = new System.Drawing.Size(115, 32);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -168,9 +176,10 @@
             this.panel4.Controls.Add(this.pr_cartonunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(25, 76);
+            this.panel4.Location = new System.Drawing.Point(33, 95);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(402, 125);
+            this.panel4.Size = new System.Drawing.Size(495, 156);
             this.panel4.TabIndex = 91;
             // 
             // pr_cartonunit
@@ -179,9 +188,10 @@
             this.pr_cartonunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_cartonunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_cartonunit.Location = new System.Drawing.Point(328, 51);
+            this.pr_cartonunit.Location = new System.Drawing.Point(409, 64);
+            this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(31, 25);
+            this.pr_cartonunit.Size = new System.Drawing.Size(38, 31);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             // 
@@ -191,9 +201,10 @@
             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(15, 51);
+            this.label22.Location = new System.Drawing.Point(20, 64);
+            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(50, 25);
+            this.label22.Size = new System.Drawing.Size(62, 31);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -203,50 +214,55 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             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("微软雅黑", 22.2F, 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(133, 25);
+            this.weight.Location = new System.Drawing.Point(139, 54);
+            this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 75);
+            this.weight.Size = new System.Drawing.Size(0, 50);
             this.weight.TabIndex = 41;
             // 
             // 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(19, 21);
+            this.label15.Location = new System.Drawing.Point(25, 26);
+            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(86, 31);
+            this.label15.Size = new System.Drawing.Size(107, 39);
             this.label15.TabIndex = 85;
             this.label15.Text = "条码号";
             // 
             // pr_detail_label
             // 
             this.pr_detail_label.AutoSize = true;
-            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(31, 366);
+            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_detail_label.Location = new System.Drawing.Point(41, 458);
+            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(96, 28);
+            this.pr_detail_label.Size = new System.Drawing.Size(115, 32);
             this.pr_detail_label.TabIndex = 82;
             this.pr_detail_label.Text = "产品型号";
             // 
             // ma_qty_label
             // 
             this.ma_qty_label.AutoSize = true;
-            this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(31, 430);
+            this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_qty_label.Location = new System.Drawing.Point(41, 538);
+            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(96, 28);
+            this.ma_qty_label.Size = new System.Drawing.Size(115, 32);
             this.ma_qty_label.TabIndex = 84;
             this.ma_qty_label.Text = "工单数量";
             // 
             // ma_salecode_label
             // 
             this.ma_salecode_label.AutoSize = true;
-            this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode_label.Location = new System.Drawing.Point(31, 301);
+            this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_salecode_label.Location = new System.Drawing.Point(41, 376);
+            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(96, 28);
+            this.ma_salecode_label.Size = new System.Drawing.Size(115, 32);
             this.ma_salecode_label.TabIndex = 83;
             this.ma_salecode_label.Text = "订单编号";
             // 
@@ -254,9 +270,10 @@
             // 
             this.Search_label.AutoSize = true;
             this.Search_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Search_label.Location = new System.Drawing.Point(608, 219);
+            this.Search_label.Location = new System.Drawing.Point(687, 271);
+            this.Search_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Search_label.Name = "Search_label";
-            this.Search_label.Size = new System.Drawing.Size(74, 21);
+            this.Search_label.Size = new System.Drawing.Size(92, 27);
             this.Search_label.TabIndex = 105;
             this.Search_label.Text = "查找历史";
             // 
@@ -265,9 +282,10 @@
             this.PriLabel.AutoSize = true;
             this.PriLabel.Checked = true;
             this.PriLabel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PriLabel.Location = new System.Drawing.Point(970, 170);
+            this.PriLabel.Location = new System.Drawing.Point(1166, 212);
+            this.PriLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PriLabel.Name = "PriLabel";
-            this.PriLabel.Size = new System.Drawing.Size(92, 25);
+            this.PriLabel.Size = new System.Drawing.Size(113, 31);
             this.PriLabel.TabIndex = 154;
             this.PriLabel.TabStop = true;
             this.PriLabel.Text = "打印标签";
@@ -277,9 +295,10 @@
             // 
             this.SupPriLabel.AutoSize = true;
             this.SupPriLabel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SupPriLabel.Location = new System.Drawing.Point(1086, 170);
+            this.SupPriLabel.Location = new System.Drawing.Point(1296, 212);
+            this.SupPriLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.SupPriLabel.Name = "SupPriLabel";
-            this.SupPriLabel.Size = new System.Drawing.Size(92, 25);
+            this.SupPriLabel.Size = new System.Drawing.Size(113, 31);
             this.SupPriLabel.TabIndex = 155;
             this.SupPriLabel.Text = "补打标签";
             this.SupPriLabel.UseVisualStyleBackColor = true;
@@ -288,18 +307,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1031, 133);
+            this.PrintLabel.Location = new System.Drawing.Point(1248, 166);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(121, 20);
+            this.PrintLabel.Size = new System.Drawing.Size(160, 23);
             this.PrintLabel.TabIndex = 157;
             // 
             // 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(930, 99);
+            this.Printer_label.Location = new System.Drawing.Point(1113, 124);
+            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(84, 20);
+            this.Printer_label.Size = new System.Drawing.Size(107, 25);
             this.Printer_label.TabIndex = 159;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -307,9 +328,10 @@
             // 
             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(974, 64);
+            this.ComList_label.Location = new System.Drawing.Point(1172, 80);
+            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(39, 20);
+            this.ComList_label.Size = new System.Drawing.Size(50, 25);
             this.ComList_label.TabIndex = 160;
             this.ComList_label.Text = "串口";
             // 
@@ -317,18 +339,19 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(944, 131);
+            this.label1.Location = new System.Drawing.Point(1132, 164);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(69, 20);
+            this.label1.Size = new System.Drawing.Size(88, 25);
             this.label1.TabIndex = 161;
             this.label1.Text = "打印标签";
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1031, 99);
-            this.Printer.Margin = new System.Windows.Forms.Padding(4);
+            this.Printer.Location = new System.Drawing.Point(1248, 124);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(120, 22);
+            this.Printer.Size = new System.Drawing.Size(160, 28);
             this.Printer.TabIndex = 158;
             // 
             // StartWeight
@@ -338,12 +361,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(748, 26);
+            this.StartWeight.Location = new System.Drawing.Point(872, 36);
+            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(75, 24);
+            this.StartWeight.Size = new System.Drawing.Size(100, 30);
             this.StartWeight.TabIndex = 156;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -356,12 +380,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(1086, 214);
+            this.Cancel.Location = new System.Drawing.Point(1309, 269);
+            this.Cancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(75, 23);
+            this.Cancel.Size = new System.Drawing.Size(100, 29);
             this.Cancel.TabIndex = 153;
             this.Cancel.Text = "取消";
             this.Cancel.UseVisualStyleBackColor = true;
@@ -374,12 +399,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(970, 214);
+            this.Confirm.Location = new System.Drawing.Point(1166, 268);
+            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(75, 23);
+            this.Confirm.Size = new System.Drawing.Size(100, 29);
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "打印";
             this.Confirm.UseVisualStyleBackColor = true;
@@ -388,9 +414,10 @@
             // pd_barcode
             // 
             this.pd_barcode.AutoSize = true;
-            this.pd_barcode.Location = new System.Drawing.Point(1029, 14);
+            this.pd_barcode.Location = new System.Drawing.Point(1245, 18);
+            this.pd_barcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pd_barcode.Name = "pd_barcode";
-            this.pd_barcode.Size = new System.Drawing.Size(65, 12);
+            this.pd_barcode.Size = new System.Drawing.Size(87, 15);
             this.pd_barcode.TabIndex = 107;
             this.pd_barcode.Text = "pd_barcode";
             this.pd_barcode.Visible = false;
@@ -402,12 +429,13 @@
             this.Search.Condition = null;
             this.Search.DBTitle = "查找历史";
             this.Search.FormName = null;
-            this.Search.Location = new System.Drawing.Point(701, 219);
+            this.Search.Location = new System.Drawing.Point(811, 271);
+            this.Search.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Search.Name = "Search";
             this.Search.Power = null;
             this.Search.SelectField = null;
             this.Search.SetValueField = null;
-            this.Search.Size = new System.Drawing.Size(216, 21);
+            this.Search.Size = new System.Drawing.Size(288, 26);
             this.Search.TabIndex = 104;
             this.Search.TableName = null;
             this.Search.TextBoxEnable = false;
@@ -421,10 +449,11 @@
             this.pa_weight,
             this.weight_time,
             this.user});
-            this.dataGridViewWithSerialNum1.Location = new System.Drawing.Point(466, 253);
+            this.dataGridViewWithSerialNum1.Location = new System.Drawing.Point(562, 316);
+            this.dataGridViewWithSerialNum1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dataGridViewWithSerialNum1.Name = "dataGridViewWithSerialNum1";
             this.dataGridViewWithSerialNum1.RowTemplate.Height = 23;
-            this.dataGridViewWithSerialNum1.Size = new System.Drawing.Size(452, 266);
+            this.dataGridViewWithSerialNum1.Size = new System.Drawing.Size(537, 332);
             this.dataGridViewWithSerialNum1.TabIndex = 103;
             // 
             // pa_outboxcode
@@ -454,12 +483,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(843, 26);
+            this.StopWeight.Location = new System.Drawing.Point(999, 36);
+            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(75, 24);
+            this.StopWeight.Size = new System.Drawing.Size(100, 30);
             this.StopWeight.TabIndex = 102;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -468,38 +498,42 @@
             // ma_code
             // 
             this.ma_code.AutoSize = true;
-            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(141, 249);
+            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_code.Location = new System.Drawing.Point(188, 311);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 21);
+            this.ma_code.Size = new System.Drawing.Size(0, 32);
             this.ma_code.TabIndex = 101;
             this.ma_code.Tag = "1";
             // 
             // 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(141, 437);
+            this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_qty.Location = new System.Drawing.Point(188, 546);
+            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, 32);
             this.ma_qty.TabIndex = 100;
             // 
             // 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(141, 373);
+            this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_detail.Location = new System.Drawing.Point(188, 466);
+            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, 32);
             this.pr_detail.TabIndex = 99;
             // 
             // 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(141, 308);
+            this.ma_salecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_salecode.Location = new System.Drawing.Point(188, 385);
+            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, 21);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 32);
             this.ma_salecode.TabIndex = 98;
             // 
             // Clean
@@ -509,12 +543,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(1024, 573);
+            this.Clean.Location = new System.Drawing.Point(1225, 717);
+            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(75, 24);
+            this.Clean.Size = new System.Drawing.Size(100, 30);
             this.Clean.TabIndex = 89;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -526,7 +561,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(25, 55);
+            this.normalButton1.Location = new System.Drawing.Point(33, 69);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -542,10 +578,11 @@
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(111, 21);
+            this.outboxcode.Location = new System.Drawing.Point(148, 26);
+            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = null;
-            this.outboxcode.Size = new System.Drawing.Size(618, 39);
+            this.outboxcode.Size = new System.Drawing.Size(721, 47);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -555,18 +592,19 @@
             // 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(938, 253);
+            this.OperateResult.Location = new System.Drawing.Point(1124, 316);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(246, 302);
+            this.OperateResult.Size = new System.Drawing.Size(297, 376);
             this.OperateResult.TabIndex = 87;
             this.OperateResult.Text = "";
             // 
             // ComList
             // 
-            this.ComList.Location = new System.Drawing.Point(1031, 64);
-            this.ComList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ComList.Location = new System.Drawing.Point(1248, 80);
+            this.ComList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(121, 20);
+            this.ComList.Size = new System.Drawing.Size(161, 25);
             this.ComList.TabIndex = 162;
             // 
             // BaudRate
@@ -574,11 +612,12 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(1032, 29);
+            this.BaudRate.Location = new System.Drawing.Point(1249, 36);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
             this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(120, 21);
+            this.BaudRate.Size = new System.Drawing.Size(159, 25);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -588,17 +627,18 @@
             // 
             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(959, 29);
+            this.BaudRate_label.Location = new System.Drawing.Point(1152, 36);
+            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(54, 20);
+            this.BaudRate_label.Size = new System.Drawing.Size(69, 25);
             this.BaudRate_label.TabIndex = 167;
             this.BaudRate_label.Text = "波特率";
             // 
             // Make_CartonBoxWeigh
             // 
-            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(1190, 608);
+            this.ClientSize = new System.Drawing.Size(1430, 760);
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.BaudRate_label);
             this.Controls.Add(this.ComList);
@@ -635,18 +675,19 @@
             this.Controls.Add(this.ma_salecode_label);
             this.Controls.Add(this.OperateResult);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_CartonBoxWeigh";
             this.Tag = "Make!CartonBoxWeigh";
             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(false);
+            this.panel6.ResumeLayout(true);
             this.panel6.PerformLayout();
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewWithSerialNum1)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.resx

@@ -523,6 +523,18 @@
   <metadata name="user.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pa_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pa_weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="weight_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="user.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="StopWeight.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

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

@@ -50,7 +50,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(107, 25);
+            this.ms_makecode.Location = new System.Drawing.Point(122, 25);
             this.ms_makecode.Name = "ms_makecode";
             this.ms_makecode.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode.TabIndex = 212;
@@ -72,7 +72,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(393, 86);
+            this.mcd_remainqty.Location = new System.Drawing.Point(402, 86);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
@@ -83,7 +83,7 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(105, 86);
+            this.mcd_okqty.Location = new System.Drawing.Point(120, 86);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
             this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
@@ -94,7 +94,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(398, 29);
+            this.ma_prodcode.Location = new System.Drawing.Point(402, 29);
             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);
@@ -104,7 +104,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(691, 25);
+            this.pr_detail.Location = new System.Drawing.Point(710, 25);
             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);
@@ -114,7 +114,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(578, 25);
+            this.pr_detail_label.Location = new System.Drawing.Point(597, 25);
             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);
@@ -212,7 +212,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1018, 602);
+            this.ClientSize = new System.Drawing.Size(990, 602);
             this.Controls.Add(this.ms_makecode);
             this.Controls.Add(this.deleteButton1);
             this.Controls.Add(this.mcd_remainqty);

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

@@ -50,7 +50,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(578, 28);
+            this.pr_detail_label.Location = new System.Drawing.Point(603, 28);
             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);
@@ -74,7 +74,7 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(290, 89);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(315, 89);
             this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
             this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
@@ -96,7 +96,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(290, 28);
+            this.pr_code_label.Location = new System.Drawing.Point(315, 28);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(92, 27);
@@ -118,7 +118,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(107, 28);
+            this.ms_makecode.Location = new System.Drawing.Point(125, 28);
             this.ms_makecode.Name = "ms_makecode";
             this.ms_makecode.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode.TabIndex = 198;
@@ -140,7 +140,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(393, 89);
+            this.mcd_remainqty.Location = new System.Drawing.Point(424, 89);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
@@ -151,7 +151,7 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(105, 89);
+            this.mcd_okqty.Location = new System.Drawing.Point(123, 89);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
             this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
@@ -162,7 +162,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(398, 32);
+            this.ma_prodcode.Location = new System.Drawing.Point(424, 32);
             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);
@@ -172,7 +172,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(691, 28);
+            this.pr_detail.Location = new System.Drawing.Point(721, 28);
             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);

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

@@ -54,17 +54,17 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1065, 111);
+            this.PrintLabel.Location = new System.Drawing.Point(1048, 111);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(201, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(178, 23);
             this.PrintLabel.TabIndex = 181;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(962, 48);
+            this.label2.Location = new System.Drawing.Point(945, 48);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(72, 27);
@@ -75,7 +75,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(962, 111);
+            this.label1.Location = new System.Drawing.Point(945, 111);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(52, 27);
@@ -163,17 +163,17 @@
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1065, 48);
+            this.Printer.Location = new System.Drawing.Point(1048, 48);
             this.Printer.Margin = new System.Windows.Forms.Padding(5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(203, 31);
+            this.Printer.Size = new System.Drawing.Size(178, 31);
             this.Printer.TabIndex = 178;
             // 
             // 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(432, 111);
+            this.mcd_remainqty.Location = new System.Drawing.Point(423, 111);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
@@ -184,7 +184,7 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(138, 111);
+            this.mcd_okqty.Location = new System.Drawing.Point(137, 111);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
             this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
@@ -195,7 +195,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(414, 50);
+            this.pr_code.Location = new System.Drawing.Point(423, 50);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.Name = "pr_code";
             this.pr_code.Size = new System.Drawing.Size(0, 27);
@@ -206,7 +206,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(697, 52);
+            this.pr_detail.Location = new System.Drawing.Point(714, 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, 27);
@@ -217,12 +217,12 @@
             this.PrintNum.AllPower = null;
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(724, 111);
+            this.PrintNum.Location = new System.Drawing.Point(714, 111);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(219, 25);
+            this.PrintNum.Size = new System.Drawing.Size(198, 25);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -261,7 +261,7 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(112, 52);
+            this.ma_code.Location = new System.Drawing.Point(137, 52);
             this.ma_code.Name = "ma_code";
             this.ma_code.Size = new System.Drawing.Size(0, 27);
             this.ma_code.TabIndex = 183;
@@ -270,7 +270,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1288, 651);
+            this.ClientSize = new System.Drawing.Size(1250, 600);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.PrintLabel);
             this.Controls.Add(this.label2);

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

@@ -58,9 +58,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, 41);
+            this.ms_makecode_label.Location = new System.Drawing.Point(44, 51);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 125;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -68,9 +69,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(252, 41);
+            this.pr_code_label.Location = new System.Drawing.Point(336, 51);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 126;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -78,9 +80,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(252, 87);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(336, 109);
+            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(74, 21);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_okqty_label.TabIndex = 127;
             this.mcd_okqty_label.Text = "打印计数";
             // 
@@ -88,9 +91,10 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(471, 87);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(628, 109);
+            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(58, 21);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
             this.mcd_remainqty_label.TabIndex = 128;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -98,9 +102,10 @@
             // 
             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(747, 148);
+            this.label4.Location = new System.Drawing.Point(996, 171);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(74, 21);
+            this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.TabIndex = 129;
             this.label4.Text = "打印张数";
             // 
@@ -110,9 +115,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(33, 85);
+            this.sncode_label.Location = new System.Drawing.Point(44, 106);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.sncode_label.Size = new System.Drawing.Size(72, 27);
             this.sncode_label.TabIndex = 145;
             this.sncode_label.Text = "序列号";
             // 
@@ -120,9 +126,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(471, 41);
+            this.pr_detail_label.Location = new System.Drawing.Point(628, 51);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 146;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -130,9 +137,10 @@
             // 
             this.sncode.AutoSize = true;
             this.sncode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode.Location = new System.Drawing.Point(745, 90);
+            this.sncode.Location = new System.Drawing.Point(993, 112);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode.Name = "sncode";
-            this.sncode.Size = new System.Drawing.Size(42, 21);
+            this.sncode.Size = new System.Drawing.Size(52, 27);
             this.sncode.TabIndex = 160;
             this.sncode.Text = "标签";
             // 
@@ -140,9 +148,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(745, 39);
+            this.label2.Location = new System.Drawing.Point(993, 49);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(58, 21);
+            this.label2.Size = new System.Drawing.Size(72, 27);
             this.label2.TabIndex = 161;
             this.label2.Text = "打印机";
             // 
@@ -150,27 +159,28 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(822, 90);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.PrintLabel.Location = new System.Drawing.Point(1096, 112);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(152, 20);
+            this.PrintLabel.Size = new System.Drawing.Size(201, 23);
             this.PrintLabel.TabIndex = 162;
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(822, 39);
-            this.Printer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Printer.Location = new System.Drawing.Point(1096, 49);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(152, 25);
+            this.Printer.Size = new System.Drawing.Size(203, 31);
             this.Printer.TabIndex = 159;
             // 
             // 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(565, 87);
+            this.mcd_remainqty.Location = new System.Drawing.Point(753, 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(19, 21);
+            this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_remainqty.TabIndex = 158;
             this.mcd_remainqty.Text = "0";
             // 
@@ -178,9 +188,10 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(345, 87);
+            this.mcd_okqty.Location = new System.Drawing.Point(460, 109);
+            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(19, 21);
+            this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_okqty.TabIndex = 157;
             this.mcd_okqty.Text = "0";
             // 
@@ -188,9 +199,10 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(347, 41);
+            this.pr_code.Location = new System.Drawing.Point(463, 51);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 21);
+            this.pr_code.Size = new System.Drawing.Size(0, 27);
             this.pr_code.TabIndex = 156;
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -198,18 +210,20 @@
             // 
             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(568, 41);
+            this.pr_detail.Location = new System.Drawing.Point(757, 51);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 154;
             // 
             // ms_makecode
             // 
             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(127, 41);
+            this.ms_makecode.Location = new System.Drawing.Point(169, 51);
+            this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 21);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode.TabIndex = 152;
             // 
             // PrintNum
@@ -217,11 +231,12 @@
             this.PrintNum.AllPower = null;
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(822, 148);
+            this.PrintNum.Location = new System.Drawing.Point(1096, 171);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(154, 21);
+            this.PrintNum.Size = new System.Drawing.Size(204, 25);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -230,9 +245,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(37, 130);
+            this.OperateResult.Location = new System.Drawing.Point(49, 162);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(691, 305);
+            this.OperateResult.Size = new System.Drawing.Size(920, 380);
             this.OperateResult.TabIndex = 143;
             this.OperateResult.Text = "";
             // 
@@ -240,10 +256,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label3.Location = new System.Drawing.Point(127, 85);
-            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label3.Location = new System.Drawing.Point(169, 106);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(0, 21);
+            this.label3.Size = new System.Drawing.Size(0, 27);
             this.label3.TabIndex = 163;
             // 
             // load
@@ -251,10 +266,10 @@
             this.load.AutoSize = true;
             this.load.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.load.ForeColor = System.Drawing.Color.Blue;
-            this.load.Location = new System.Drawing.Point(37, 447);
-            this.load.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.load.Location = new System.Drawing.Point(49, 559);
+            this.load.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.load.Name = "load";
-            this.load.Size = new System.Drawing.Size(60, 25);
+            this.load.Size = new System.Drawing.Size(73, 31);
             this.load.TabIndex = 164;
             this.load.TabStop = true;
             this.load.Text = "上料";
@@ -265,10 +280,10 @@
             this.unload.AutoSize = true;
             this.unload.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.unload.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.unload.Location = new System.Drawing.Point(140, 447);
-            this.unload.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.unload.Location = new System.Drawing.Point(187, 559);
+            this.unload.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.unload.Name = "unload";
-            this.unload.Size = new System.Drawing.Size(60, 25);
+            this.unload.Size = new System.Drawing.Size(73, 31);
             this.unload.TabIndex = 165;
             this.unload.TabStop = true;
             this.unload.Text = "下料";
@@ -279,11 +294,11 @@
             this.code.AllPower = null;
             this.code.BackColor = System.Drawing.Color.White;
             this.code.ID = null;
-            this.code.Location = new System.Drawing.Point(339, 450);
-            this.code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.code.Location = new System.Drawing.Point(452, 562);
+            this.code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.code.Name = "code";
             this.code.Power = null;
-            this.code.Size = new System.Drawing.Size(132, 21);
+            this.code.Size = new System.Drawing.Size(175, 25);
             this.code.Str = null;
             this.code.Str1 = null;
             this.code.Str2 = null;
@@ -293,18 +308,17 @@
             // 
             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(268, 448);
-            this.code_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.code_label.Location = new System.Drawing.Point(357, 560);
             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 = 167;
             this.code_label.Text = "录入框";
             // 
             // Make_ColorBoxLoadPrint
             // 
-            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(1012, 483);
+            this.ClientSize = new System.Drawing.Size(1349, 604);
             this.Controls.Add(this.code_label);
             this.Controls.Add(this.code);
             this.Controls.Add(this.unload);
@@ -329,6 +343,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_ColorBoxLoadPrint";
             this.Tag = "Make!ColorBoxLoadPrint";
             this.Text = "标签打印";

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

@@ -105,22 +105,22 @@
             // pr_colorboxgw_label
             // 
             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(30, 85);
+            this.pr_colorboxgw_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_colorboxgw_label.Location = new System.Drawing.Point(30, 96);
             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(137, 39);
+            this.pr_colorboxgw_label.Size = new System.Drawing.Size(115, 32);
             this.pr_colorboxgw_label.TabIndex = 42;
             this.pr_colorboxgw_label.Text = "标准重量";
             // 
             // pr_code_label
             // 
             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(29, 22);
+            this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_code_label.Location = new System.Drawing.Point(29, 33);
             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(137, 39);
+            this.pr_code_label.Size = new System.Drawing.Size(115, 32);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -144,7 +144,7 @@
             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(592, 98);
+            this.panel6.Location = new System.Drawing.Point(540, 98);
             this.panel6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel6.Name = "panel6";
             this.panel6.Size = new System.Drawing.Size(507, 154);
@@ -153,22 +153,22 @@
             // 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(240, 85);
+            this.pr_colorboxgw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_colorboxgw.Location = new System.Drawing.Point(188, 96);
             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, 39);
+            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 32);
             this.pr_colorboxgw.TabIndex = 80;
             this.pr_colorboxgw.Tag = "1";
             // 
             // pr_code
             // 
             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(240, 22);
+            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_code.Location = new System.Drawing.Point(188, 33);
             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, 39);
+            this.pr_code.Size = new System.Drawing.Size(0, 32);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
@@ -206,7 +206,7 @@
             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(551, 154);
+            this.panel4.Size = new System.Drawing.Size(490, 154);
             this.panel4.TabIndex = 63;
             // 
             // label15
@@ -224,7 +224,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(18, 403);
+            this.pr_detail_label.Location = new System.Drawing.Point(18, 407);
             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);
@@ -234,19 +234,19 @@
             // Temp1
             // 
             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.Font = new System.Drawing.Font("微软雅黑", 16.2F, 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(76, 35);
+            this.Temp1.Location = new System.Drawing.Point(76, 46);
             this.Temp1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Temp1.Name = "Temp1";
-            this.Temp1.Size = new System.Drawing.Size(0, 48);
+            this.Temp1.Size = new System.Drawing.Size(0, 36);
             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(592, 273);
+            this.panel3.Location = new System.Drawing.Point(540, 273);
             this.panel3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel3.Name = "panel3";
             this.panel3.Size = new System.Drawing.Size(507, 122);
@@ -255,12 +255,12 @@
             // Temp2
             // 
             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.Font = new System.Drawing.Font("微软雅黑", 16.2F, 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(76, 32);
+            this.Temp2.Location = new System.Drawing.Point(76, 43);
             this.Temp2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Temp2.Name = "Temp2";
-            this.Temp2.Size = new System.Drawing.Size(0, 48);
+            this.Temp2.Size = new System.Drawing.Size(0, 36);
             this.Temp2.TabIndex = 39;
             // 
             // panel2
@@ -268,7 +268,7 @@
             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(592, 428);
+            this.panel2.Location = new System.Drawing.Point(540, 421);
             this.panel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(507, 122);
@@ -299,19 +299,19 @@
             // Temp3
             // 
             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.Font = new System.Drawing.Font("微软雅黑", 16.2F, 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(76, 32);
+            this.Temp3.Location = new System.Drawing.Point(76, 44);
             this.Temp3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Temp3.Name = "Temp3";
-            this.Temp3.Size = new System.Drawing.Size(0, 48);
+            this.Temp3.Size = new System.Drawing.Size(0, 36);
             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(592, 583);
+            this.panel1.Location = new System.Drawing.Point(540, 567);
             this.panel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(507, 122);
@@ -332,17 +332,17 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1269, 150);
+            this.PrintLabel.Location = new System.Drawing.Point(1211, 150);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(160, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(159, 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(1124, 108);
+            this.Printer_label.Location = new System.Drawing.Point(1066, 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(107, 25);
@@ -353,7 +353,7 @@
             // 
             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(1144, 148);
+            this.PrintLabel_label.Location = new System.Drawing.Point(1086, 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(88, 25);
@@ -364,7 +364,7 @@
             // 
             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(1181, 68);
+            this.ComList_label.Location = new System.Drawing.Point(1123, 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(50, 25);
@@ -373,10 +373,10 @@
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1269, 108);
-            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Printer.Location = new System.Drawing.Point(1211, 108);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(160, 32);
+            this.Printer.Size = new System.Drawing.Size(159, 25);
             this.Printer.TabIndex = 160;
             // 
             // StopWeight
@@ -386,7 +386,7 @@
             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(999, 32);
+            this.StopWeight.Location = new System.Drawing.Point(947, 31);
             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";
@@ -405,7 +405,7 @@
             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(880, 32);
+            this.StartWeight.Location = new System.Drawing.Point(828, 31);
             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";
@@ -445,7 +445,7 @@
             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(1310, 183);
+            this.Cancel.Location = new System.Drawing.Point(1252, 188);
             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";
@@ -464,7 +464,7 @@
             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(1186, 183);
+            this.Confirm.Location = new System.Drawing.Point(1128, 188);
             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";
@@ -501,7 +501,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(139, 403);
+            this.pr_detail.Location = new System.Drawing.Point(139, 407);
             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);
@@ -524,7 +524,7 @@
             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(1253, 678);
+            this.Clean.Location = new System.Drawing.Point(1188, 693);
             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";
@@ -564,7 +564,7 @@
             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(720, 47);
+            this.sncode.Size = new System.Drawing.Size(676, 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(1122, 232);
+            this.OperateResult.Location = new System.Drawing.Point(1064, 232);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(343, 432);
+            this.OperateResult.Size = new System.Drawing.Size(319, 457);
             this.OperateResult.TabIndex = 58;
             this.OperateResult.Text = "";
             // 
@@ -585,7 +585,7 @@
             // 
             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(1161, 33);
+            this.BaudRate_label.Location = new System.Drawing.Point(1103, 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(69, 25);
@@ -597,7 +597,7 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(1269, 32);
+            this.BaudRate.Location = new System.Drawing.Point(1211, 32);
             this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
@@ -610,17 +610,17 @@
             // 
             // ComList
             // 
-            this.ComList.Location = new System.Drawing.Point(1269, 68);
+            this.ComList.Location = new System.Drawing.Point(1211, 68);
             this.ComList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(162, 25);
+            this.ComList.Size = new System.Drawing.Size(159, 25);
             this.ComList.TabIndex = 167;
             // 
             // Make_ColorBoxWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1480, 730);
+            this.ClientSize = new System.Drawing.Size(1390, 730);
             this.Controls.Add(this.ComList);
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.BaudRate_label);

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

@@ -54,20 +54,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1213, 140);
+            this.PrintLabel.Location = new System.Drawing.Point(1052, 85);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(226, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(169, 23);
             this.PrintLabel.TabIndex = 181;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1097, 65);
+            this.label2.Location = new System.Drawing.Point(949, 22);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(86, 31);
+            this.label2.Size = new System.Drawing.Size(72, 27);
             this.label2.TabIndex = 180;
             this.label2.Text = "打印机";
             // 
@@ -75,10 +75,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.Location = new System.Drawing.Point(1097, 140);
+            this.label1.Location = new System.Drawing.Point(949, 85);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 31);
+            this.label1.Size = new System.Drawing.Size(52, 27);
             this.label1.TabIndex = 179;
             this.label1.Text = "标签";
             // 
@@ -86,10 +86,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(686, 67);
+            this.pr_detail_label.Location = new System.Drawing.Point(600, 24);
             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 = 171;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -99,10 +99,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(29, 678);
+            this.sncode_label.Location = new System.Drawing.Point(16, 533);
             this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(86, 31);
+            this.sncode_label.Size = new System.Drawing.Size(72, 27);
             this.sncode_label.TabIndex = 170;
             this.sncode_label.Text = "序列号";
             // 
@@ -110,10 +110,10 @@
             // 
             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(686, 140);
+            this.label4.Location = new System.Drawing.Point(600, 85);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(110, 31);
+            this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.TabIndex = 167;
             this.label4.Text = "打印张数";
             // 
@@ -121,10 +121,10 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(358, 140);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(308, 85);
             this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(86, 31);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
             this.mcd_remainqty_label.TabIndex = 166;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -132,10 +132,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(29, 140);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(16, 85);
             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(110, 31);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_okqty_label.TabIndex = 165;
             this.mcd_okqty_label.Text = "打印计数";
             // 
@@ -143,10 +143,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(358, 67);
+            this.pr_code_label.Location = new System.Drawing.Point(308, 24);
             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(110, 31);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 164;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -154,10 +154,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(29, 67);
+            this.ms_makecode_label.Location = new System.Drawing.Point(16, 24);
             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 = 163;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -165,27 +165,27 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_code.Location = new System.Drawing.Point(157, 67);
+            this.ma_code.Location = new System.Drawing.Point(130, 24);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 31);
+            this.ma_code.Size = new System.Drawing.Size(0, 27);
             this.ma_code.TabIndex = 182;
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1213, 65);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Location = new System.Drawing.Point(1052, 22);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(228, 37);
+            this.Printer.Size = new System.Drawing.Size(169, 31);
             this.Printer.TabIndex = 178;
             // 
             // 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(501, 140);
+            this.mcd_remainqty.Location = new System.Drawing.Point(435, 85);
             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(28, 31);
+            this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_remainqty.TabIndex = 177;
             this.mcd_remainqty.Text = "0";
             // 
@@ -193,10 +193,10 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(170, 140);
+            this.mcd_okqty.Location = new System.Drawing.Point(130, 85);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_okqty.TabIndex = 176;
             this.mcd_okqty.Text = "0";
             // 
@@ -204,10 +204,10 @@
             // 
             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(501, 67);
+            this.ma_prodcode.Location = new System.Drawing.Point(435, 24);
             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, 31);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 175;
             this.ma_prodcode.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -215,24 +215,24 @@
             // 
             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(831, 67);
+            this.pr_detail.Location = new System.Drawing.Point(729, 24);
             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 = 174;
             // 
             // PrintNum
             // 
             this.PrintNum.AllPower = null;
             this.PrintNum.BackColor = System.Drawing.Color.White;
-            this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(829, 140);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PrintNum.Location = new System.Drawing.Point(727, 85);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(246, 39);
+            this.PrintNum.Size = new System.Drawing.Size(200, 27);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -246,11 +246,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(163, 679);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.sncode.Location = new System.Drawing.Point(135, 534);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(292, 28);
+            this.sncode.Size = new System.Drawing.Size(260, 25);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -261,19 +261,19 @@
             // 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(35, 200);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Location = new System.Drawing.Point(21, 135);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1057, 455);
+            this.OperateResult.Size = new System.Drawing.Size(940, 380);
             this.OperateResult.TabIndex = 168;
             this.OperateResult.Text = "";
             // 
             // Make_FuselageLabelPrint
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSize = true;
-            this.ClientSize = new System.Drawing.Size(1468, 731);
+            this.ClientSize = new System.Drawing.Size(1240, 580);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.PrintLabel);
             this.Controls.Add(this.label2);
@@ -294,7 +294,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_FuselageLabelPrint";
             this.Tag = "Make!FuselageLabelPrint";
             this.Text = "Make_FuselageLabelPrint";

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

@@ -78,7 +78,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail_label.Location = new System.Drawing.Point(801, 36);
+            this.pr_detail_label.Location = new System.Drawing.Point(804, 36);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
             this.pr_detail_label.TabIndex = 2;
@@ -108,10 +108,11 @@
             // 
             this.ms_macode.AutoSize = true;
             this.ms_macode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_macode.Location = new System.Drawing.Point(191, 36);
+            this.ms_macode.Location = new System.Drawing.Point(185, 36);
             this.ms_macode.Name = "ms_macode";
             this.ms_macode.Size = new System.Drawing.Size(0, 31);
             this.ms_macode.TabIndex = 5;
+            this.ms_macode.TextChanged += new System.EventHandler(this.ms_macode_TextChanged);
             // 
             // remain_qty
             // 
@@ -126,7 +127,7 @@
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode.Location = new System.Drawing.Point(570, 36);
+            this.ma_prodcode.Location = new System.Drawing.Point(576, 36);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             this.ma_prodcode.TabIndex = 7;
@@ -135,16 +136,17 @@
             // 
             this.count.AutoSize = true;
             this.count.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.count.Location = new System.Drawing.Point(558, 91);
+            this.count.Location = new System.Drawing.Point(576, 91);
             this.count.Name = "count";
-            this.count.Size = new System.Drawing.Size(0, 31);
+            this.count.Size = new System.Drawing.Size(28, 31);
             this.count.TabIndex = 8;
+            this.count.Text = "0";
             // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(955, 36);
+            this.pr_detail.Location = new System.Drawing.Point(946, 36);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 31);
             this.pr_detail.TabIndex = 9;
@@ -197,12 +199,13 @@
             // 
             this.TSNLength.AllPower = null;
             this.TSNLength.BackColor = System.Drawing.Color.White;
+            this.TSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.TSNLength.ID = null;
-            this.TSNLength.Location = new System.Drawing.Point(191, 155);
+            this.TSNLength.Location = new System.Drawing.Point(191, 151);
             this.TSNLength.Name = "TSNLength";
             this.TSNLength.Negative = false;
             this.TSNLength.Power = null;
-            this.TSNLength.Size = new System.Drawing.Size(196, 28);
+            this.TSNLength.Size = new System.Drawing.Size(213, 34);
             this.TSNLength.Str = null;
             this.TSNLength.Str1 = null;
             this.TSNLength.Str2 = null;
@@ -212,12 +215,13 @@
             // 
             this.SNLength.AllPower = null;
             this.SNLength.BackColor = System.Drawing.Color.White;
+            this.SNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.SNLength.ID = null;
-            this.SNLength.Location = new System.Drawing.Point(191, 203);
+            this.SNLength.Location = new System.Drawing.Point(191, 197);
             this.SNLength.Name = "SNLength";
             this.SNLength.Negative = false;
             this.SNLength.Power = null;
-            this.SNLength.Size = new System.Drawing.Size(196, 28);
+            this.SNLength.Size = new System.Drawing.Size(213, 34);
             this.SNLength.Str = null;
             this.SNLength.Str1 = null;
             this.SNLength.Str2 = null;
@@ -227,11 +231,12 @@
             // 
             this.TSNPre.AllPower = null;
             this.TSNPre.BackColor = System.Drawing.Color.White;
+            this.TSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.TSNPre.ID = null;
-            this.TSNPre.Location = new System.Drawing.Point(601, 155);
+            this.TSNPre.Location = new System.Drawing.Point(582, 151);
             this.TSNPre.Name = "TSNPre";
             this.TSNPre.Power = null;
-            this.TSNPre.Size = new System.Drawing.Size(196, 28);
+            this.TSNPre.Size = new System.Drawing.Size(210, 34);
             this.TSNPre.Str = null;
             this.TSNPre.Str1 = null;
             this.TSNPre.Str2 = null;
@@ -241,11 +246,12 @@
             // 
             this.SNPre.AllPower = null;
             this.SNPre.BackColor = System.Drawing.Color.White;
+            this.SNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.SNPre.ID = null;
-            this.SNPre.Location = new System.Drawing.Point(601, 203);
+            this.SNPre.Location = new System.Drawing.Point(582, 200);
             this.SNPre.Name = "SNPre";
             this.SNPre.Power = null;
-            this.SNPre.Size = new System.Drawing.Size(196, 28);
+            this.SNPre.Size = new System.Drawing.Size(210, 34);
             this.SNPre.Str = null;
             this.SNPre.Str1 = null;
             this.SNPre.Str2 = null;
@@ -254,9 +260,10 @@
             // tip
             // 
             this.tip.AutoSize = true;
+            this.tip.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
             this.tip.Location = new System.Drawing.Point(41, 252);
             this.tip.Name = "tip";
-            this.tip.Size = new System.Drawing.Size(116, 18);
+            this.tip.Size = new System.Drawing.Size(158, 31);
             this.tip.TabIndex = 18;
             this.tip.Text = "采集提示信息";
             // 
@@ -284,6 +291,7 @@
             this.cancel.TabIndex = 20;
             this.cancel.Text = "取消";
             this.cancel.UseVisualStyleBackColor = false;
+            this.cancel.Click += new System.EventHandler(this.cancel_Click);
             // 
             // in_label
             // 

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -16,15 +17,25 @@ namespace UAS_MES.FunctionCode.Make
     {
         AutoSizeFormClass asc = new AutoSizeFormClass();
 
+        LogStringBuilder sql = new LogStringBuilder();
+
         DataHelper dh;
         //原序列号
-        string TSN;
+        string TSN="";
         //转换后序列号
-        string SN;
+        string SN="";
         //错误信息
         string errorMessage;
         //存放productsnrelation表中的数据
+        DataTable ListA;
+        //存放工单信息
         DataTable dt;
+        //step  记录检验规则的进度
+        int step=0;
+        //记录采集的IMEI，BT，MAC等信息
+        Hashtable hs;
+        //存放关联信息类型
+        string type;
 
         public Make_SeqProgramTransform()
         {
@@ -51,25 +62,101 @@ namespace UAS_MES.FunctionCode.Make
             {
                 if (code.Text != "")
                 {
-                    OperateResult.AppendText(">>序列号：" + code.Text + " , 发送请求\n", Color.Green);
-                    //判断用户是否锁定输入TSN长度，
-                    if (!checkLengthOrPre(TSNLength_checkBox, TSNLength, "长度")) {
-                        return;
-                    }
-                    //判断用户是否锁定输入TSN前缀，
-                    if (!checkLengthOrPre(TSNPre_checkBox, TSNPre, "前缀")) {
-                        return;
-                    }
-                    string oMakecode="";
-                    string oMsid="";
-                    //核对工序
-                    if (LogicHandler.CheckStepSNAndMacode(ms_macode.Text, User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
+                    //为0，输入TSN
+                    if (step==0)
                     {
-                        //按照out出的工单号查出工单相关信息，并赋值到相关空间
+                        OperateResult.AppendText(">>序列号：" + code.Text + " , 发送请求\n", Color.Green);
+                       
+                        string oMakecode = "";
+                        string oMsid = "";
+                        //核对工序
+                        if (LogicHandler.CheckStepSNAndMacode(ms_macode.Text, User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
+                        {
+                            //核对TSN是否正确
+                            string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + code.Text + "'").ToString().Trim();
+                            if (beforesn == "" || beforesn == null)
+                            {
+                                //按照out出的工单号查出工单相关信息，并赋值到相关控件
+                                sql.Clear();
+                                sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode");
+                                sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
+                                sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_sncode=:sncode");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", code.Text);
+                                if (dt.Rows.Count > 0)
+                                {
+                                    BaseUtil.SetFormValue(this.Controls, dt);
+                                    //判断用户是否锁定输入TSN长度，
+                                    if (!checkLengthOrPre(TSNLength_checkBox, TSNLength, "长度"))
+                                    {
+                                        return;
+                                    }
+                                    //判断用户是否锁定输入TSN前缀，
+                                    if (!checkLengthOrPre(TSNPre_checkBox, TSNPre, "前缀"))
+                                    {
+                                        return;
+                                    }
+                                }
+                                else
+                                {
+                                    OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red);
+                                    return;
+                                }
+                                //获取需要关联采集的信息，以及校验规则
+                                ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");
+                                hs = new Hashtable();
+                                step = 1;
 
+                                //记录转换前的序列号
+                                TSN = code.Text;
+                                code.Text = "";
+                                OperateResult.AppendText("<<请输入SN\n", Color.Green);
+                            }
+                            else
+                            //不为空，进行过转换。不勾选修改结果，就不能再修改
+                            {
+                                OperateResult.AppendText(">>序列号" + code.Text + "已进行了转换\n", Color.Red);
+                                code.Text = "";
+                                OperateResult.AppendText("<<请重新输入TSN\n", Color.Green);
+                            }
+                        }
+                        else
+                        {
+                            OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
+                        }
                     }
-                    else {
-                        OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
+                    else if (step==1)
+                    {
+                        //开始录入SN
+                        if (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "'"))
+                        {
+                            //判断用户是否锁定输入SN长度，
+                            if (!checkLengthOrPre(SNLength_checkBox, SNLength, "长度"))
+                            {
+                                return;
+                            }
+                            //判断用户是否锁定输入SN前缀，
+                            if (!checkLengthOrPre(SNPre_checkBox, SNPre, "前缀"))
+                            {
+                                return;
+                            }
+                            //SN校验成功，合法,记录下SN
+                            SN = code.Text;
+                            //开始进行校验规则
+                            OperateResult.AppendText("<<请输入" + ListA.Rows[0]["psr_type"] + "\n", Color.Green);
+                            //step+1
+                            step = 2;
+                        }
+                        else
+                        {
+                            OperateResult.AppendText(">>序列号" + code.Text + "已存在，请输入其他序列号\n", Color.Red);
+                        }
+                    }
+                    else if(step < ListA.Rows.Count + 2)
+                    {
+                        //开始进行校验规则
+                        if (checkRules(step)) {
+                            step += 1;
+                        }
                     }
                 }
                 else {
@@ -115,5 +202,254 @@ namespace UAS_MES.FunctionCode.Make
             }
             return true;
         }
+        /// <summary>
+        /// 关联采集的校验
+        /// </summary>
+        /// <param name="step"></param>
+        private bool checkRules(int step)
+        {
+            type = ListA.Rows[step - 1]["psr_type"].ToString()=="WIFI"?"MAC": ListA.Rows[step - 1]["psr_type"].ToString();
+            //如果前缀和长度都满足的话
+            if ((ListA.Rows[step-1]["psr_length"].ToString() == "" ? true : code.Text.Length == ListA.Rows[step-1]["psr_length"].ToString().Length) && (ListA.Rows[0]["psr_prefix"].ToString() == "" ? true : code.Text.StartsWith(ListA.Rows[0]["psr_prefix"].ToString())))
+            {
+                switch (type)
+                {
+                    case "IMEI1":
+                    case "IMEI2":
+                    case "IMEI3":
+                        if (checkExist("ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "'"))
+                        {
+                            return false;
+                        }
+                        else
+                        {
+                            //判断IMEI1,IMEI2,IMEI3中是否已经有这个号了
+                            foreach (DictionaryEntry de in hs) {
+                                if (de.Key.ToString().Contains("IMEI")&&de.Value.ToString()==code.Text) {
+                                    OperateResult.AppendText(">>" + type + ":" + code.Text + "已录，请重新输入\n", Color.Red);
+                                    code.Text = "";
+                                    return false;
+                                }
+                            }
+                        }
+                        break;
+                    case "BT":
+                    case "MAC":
+                    case "NETCODE":
+                        if (checkExist("MS_"+type+"='"+code.Text+"'")) {
+                            return false;
+                        }
+                        break;
+                }
+                //满足规则，则采集
+                hs.Add(type,code.Text);
+                //说明已经是最后一个校验规则
+                if (step == ListA.Rows.Count+1)
+                {
+                    //校验已经完成,此时要再次校验之前的SN和关联采集信息
+                    //再次校验SN
+                    if (!dh.CheckExist("makeserial", "ms_sncode='" + SN + "'"))
+                    {
+                        bool flag = true;
+                        StringBuilder s1 = new StringBuilder();
+                        //再次校验关联采集信息
+                        foreach (DictionaryEntry de in hs)
+                        {
+                            s1.Append("MS_"+ de.Key.ToString()+" = '"+de.Value.ToString()+"',");
+                            if (de.Key.ToString().Contains("IMEI"))
+                            {
+                                if (checkExist("ms_imei1='" + de.Value.ToString() + "' or ms_imei2 = '" + de.Value.ToString() + "' or ms_imei3 = '" + de.Value.ToString() + "'"))
+                                {
+                                    flag = false;
+                                    OperateResult.AppendText(">>"+de.Key.ToString()+":" + de.Value.ToString() + "已存在，请重新输入TSN\n", Color.Red);
+                                    //清空信息
+                                    clearInfo();
+                                    break;
+                                }
+                            }
+                            else
+                            {
+                                if (checkExist("MS_" + de.Key.ToString() + "='" + de.Value.ToString() + "'"))
+                                {
+                                    flag = false;
+                                    OperateResult.AppendText(">>" + de.Key.ToString() + ":" + de.Value.ToString() + "已存在，请重新输入TSN\n", Color.Red);
+                                    //清空信息
+                                    clearInfo();
+                                    break;
+                                }
+                            }
+                        }
+                        //根据flag判断关联采集信息二次校验结果
+                        if (flag=true) {
+                            //说明SN和关联采集信息二次校验通过，则进行转换和采集信息绑定
+                            //查询ms_firstsn
+                            string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_sncode='" + TSN + "'").ToString();
+                            //记录本次修改，存入makesnrelation表中
+                            string updateSql = "update makeserial set ms_sncode='" + SN + "', ms_beforesn='" + TSN + "',"+ s1.Remove(s1.Length - 1, 1).ToString() + " where ms_sncode='" + TSN + "'";
+                            string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + TSN + "','" + SN + "','" + firstsn + "','" + ms_macode.Text + "', sysdate ,'" + User.UserCode + "')";
+                            dh.ExecuteSQLTran(updateSql, insertSql);
+                            OperateResult.AppendText(">>序列号转换成功\n", Color.Green);
+                            //写入日志
+                            LogManager.DoLog("修改序列号：" + TSN + "为" + SN + "成功！" + "操作人：" + User.UserCode);
+                            //完成该道工序 setFinish
+                            LogicHandler.UpdateMakeMessage(TSN, ms_macode.Text, "序列烧录转换", User.UserSourceCode, User.UserCode, "序列烧录转换成功", out errorMessage);
+
+                            //输出提示用户“>>序列号转换成功”，“>>关联采集成功”
+                            OperateResult.AppendText(">>关联采集成功\n", Color.Green);
+                            //更新页面计数+1
+                            count.Text = int.Parse(count.Text) + 1 + "";
+                        }
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>序列号" + SN + "已存在，请重新输入TSN\n", Color.Red);
+                        //清空信息
+                        clearInfo();
+                    }
+                    return false;
+                }
+                else {
+                    OperateResult.AppendText("<<请输入"+ ListA.Rows[step]["psr_type"] + "\n", Color.Green);
+                    return true;
+                }
+            }
+            else {
+                //重新输入
+                OperateResult.AppendText(">>" + ListA.Rows[step-1]["psr_type"] + "校验不通过,请重新输入\n", Color.Red);
+                return false;
+            }
+        }
+        /// <summary>
+        /// 工单号变化时，带出校验规则
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ms_macode_TextChanged(object sender, EventArgs e)
+        {
+            //清空
+            TSNPre.Text = "";
+            TSNLength.Text = "";
+            SNPre.Text = "";
+            SNLength.Text = "";
+
+            //取消勾选
+            TSNPre_checkBox.Checked = false;
+            TSNLength_checkBox.Checked = false;
+            SNPre_checkBox.Checked = false;
+            SNLength_checkBox.Checked = false;
+
+            //设置可编辑
+            TSNLength.Enabled = true;
+            TSNPre.Enabled = true;
+            SNLength.Enabled = true;
+            SNPre.Enabled = true;
+
+            //查询表工单序列号防呆规则表
+            dt = (DataTable)dh.ExecuteSql("select msr_type, msr_prefix ,msr_length from makesnrule where msr_makecode='" + ms_macode.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                foreach (DataRow dr in dt.Rows)
+                {
+                    //如果有值，则这个字段自动勾选，并且不可编辑
+                    if (dr["msr_type"].ToString().ToLower() == "before")
+                    {
+                        //msr_type=before 的值赋值到转换前
+
+                        //临时变量记录
+                        string length = dr["msr_length"].ToString();
+                        string prefix = dr["msr_prefix"].ToString();
+                        //不为空
+                        if (prefix != "" && prefix != null)
+                        {
+                            //则赋值
+                            TSNPre.Text = prefix;
+                            //设置不可编辑
+                            TSNPre.Enabled = false;
+                            //勾选
+                            TSNPre_checkBox.Checked = true;
+                        }
+                        if (length != "" && length != null)
+                        {
+                            //赋值
+                            TSNLength.Text = length;
+                            //设置不可编辑
+                            TSNLength.Enabled = false;
+                            //勾选
+                            TSNLength_checkBox.Checked = true;
+                        }
+                    }
+                    else if (dr["msr_type"].ToString().ToLower() == "after")
+                    {
+                        //msr_type=after 的值赋值到转换后
+
+                        //临时变量记录
+                        string length = dr["msr_length"].ToString();
+                        string prefix = dr["msr_prefix"].ToString();
+                        //不为空
+                        if (prefix != "" && prefix != null)
+                        {
+                            //则赋值
+                            SNPre.Text = prefix;
+                            //设置不可编辑
+                            SNPre.Enabled = false;
+                            //勾选
+                            SNPre_checkBox.Checked = true;
+                        }
+                        if (length != "" && length != null)
+                        {
+                            //赋值
+                            SNLength.Text = length;
+                            //设置不可编辑
+                            SNLength.Enabled = false;
+                            //勾选
+                            SNLength_checkBox.Checked = true;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                /*	如果转换前没有值，则取 select productsnrule where psr_prodcode=? 产品编号，
+                 *	有值则赋值到 转换前，并且自动勾选不可编辑。*/
+                //dt = (DataTable)dh.ExecuteSql("select psr_prefix ,psr_length from productsnrule where psr_prodcode = " + ma_prodcode.Text, "select");
+                //if (dt.Rows.Count > 0)
+                //{
+                //    //将产品序列号防呆规则查出的数据填充
+                //    beforeTransSNPre.Text = dt.Rows[0]["psr_prefix"].ToString();
+                //    beforeTransSNPre.ReadOnly = true;
+                //    beforeTransSNPre_checkBox.Checked = true;
+                //    beforeTransSNLength.Text = dt.Rows[0]["psr_length"].ToString();
+                //    beforeTransSNLength.ReadOnly = true;
+                //    beforeTransSNLength_checkBox.Checked = true;
+                //}
+            }
+        }
+        
+        private bool checkExist(string fields) {
+            //不存在
+            if (!dh.CheckExist("makeserial", fields))
+            {
+                //则记录
+                return false;
+            }
+            else {
+                OperateResult.AppendText(">>"+type+"错误，不允许重复\n", Color.Red);
+                return true;
+            }
+        }
+        private void clearInfo() {
+            //步骤重置为0
+            step = 0;
+            //关联采集信息清空
+            hs.Clear();
+        }
+
+        private void cancel_Click(object sender, EventArgs e)
+        {
+            //清除已经采集的所有信息
+            clearInfo();
+            //提示用户输入TSN
+            OperateResult.AppendText("<<请输入TSN\n", Color.Green);
+        }
     }
 }

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

@@ -58,36 +58,40 @@
             // 
             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(585, 15);
+            this.pr_detail.Location = new System.Drawing.Point(878, 22);
+            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, 31);
             this.pr_detail.TabIndex = 65;
             // 
             // 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(15, 17);
+            this.ms_makecode_label.Location = new System.Drawing.Point(22, 26);
+            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(0, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(0, 31);
             this.ms_makecode_label.TabIndex = 61;
             // 
             // 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(355, 15);
+            this.ma_prodcode.Location = new System.Drawing.Point(532, 22);
+            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, 31);
             this.ma_prodcode.TabIndex = 64;
             // 
             // pr_detail_label
             // 
             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(492, 15);
+            this.pr_detail_label.Location = new System.Drawing.Point(738, 22);
+            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(110, 31);
             this.pr_detail_label.TabIndex = 62;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -95,9 +99,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(264, 15);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(396, 22);
+            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(110, 31);
             this.ma_prodcode_label.TabIndex = 63;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -105,9 +110,10 @@
             // 
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(15, 441);
+            this.sncode_label.Location = new System.Drawing.Point(22, 662);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.sncode_label.Size = new System.Drawing.Size(86, 31);
             this.sncode_label.TabIndex = 68;
             this.sncode_label.Text = "录入框";
             // 
@@ -115,9 +121,10 @@
             // 
             this.ChangeResult.AutoSize = true;
             this.ChangeResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChangeResult.Location = new System.Drawing.Point(296, 441);
+            this.ChangeResult.Location = new System.Drawing.Point(444, 662);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChangeResult.Name = "ChangeResult";
-            this.ChangeResult.Size = new System.Drawing.Size(125, 25);
+            this.ChangeResult.Size = new System.Drawing.Size(184, 35);
             this.ChangeResult.TabIndex = 70;
             this.ChangeResult.Text = "修改转换结果";
             this.ChangeResult.UseVisualStyleBackColor = true;
@@ -126,9 +133,10 @@
             // 
             this.changenum_lanel.AutoSize = true;
             this.changenum_lanel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.changenum_lanel.Location = new System.Drawing.Point(439, 441);
+            this.changenum_lanel.Location = new System.Drawing.Point(658, 662);
+            this.changenum_lanel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.changenum_lanel.Name = "changenum_lanel";
-            this.changenum_lanel.Size = new System.Drawing.Size(74, 21);
+            this.changenum_lanel.Size = new System.Drawing.Size(110, 31);
             this.changenum_lanel.TabIndex = 71;
             this.changenum_lanel.Text = "转换数量";
             // 
@@ -136,10 +144,9 @@
             // 
             this.beforeTransSNLength_checkBox.AutoSize = true;
             this.beforeTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(20, 63);
-            this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(30, 94);
             this.beforeTransSNLength_checkBox.Name = "beforeTransSNLength_checkBox";
-            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(140, 24);
+            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
             this.beforeTransSNLength_checkBox.TabIndex = 81;
             this.beforeTransSNLength_checkBox.Text = "转换前序列号长度";
             this.beforeTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -148,10 +155,9 @@
             // 
             this.afterTransSNLength_checkBox.AutoSize = true;
             this.afterTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(20, 96);
-            this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(30, 144);
             this.afterTransSNLength_checkBox.Name = "afterTransSNLength_checkBox";
-            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(140, 24);
+            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
             this.afterTransSNLength_checkBox.TabIndex = 82;
             this.afterTransSNLength_checkBox.Text = "转换后序列号长度";
             this.afterTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -160,10 +166,9 @@
             // 
             this.beforeTransSNPre_checkBox.AutoSize = true;
             this.beforeTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(421, 62);
-            this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(632, 93);
             this.beforeTransSNPre_checkBox.Name = "beforeTransSNPre_checkBox";
-            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(140, 24);
+            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
             this.beforeTransSNPre_checkBox.TabIndex = 83;
             this.beforeTransSNPre_checkBox.Text = "转换前序列号前缀";
             this.beforeTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -172,10 +177,9 @@
             // 
             this.afterTransSNPre_checkBox.AutoSize = true;
             this.afterTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(421, 95);
-            this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(632, 142);
             this.afterTransSNPre_checkBox.Name = "afterTransSNPre_checkBox";
-            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(140, 24);
+            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
             this.afterTransSNPre_checkBox.TabIndex = 84;
             this.afterTransSNPre_checkBox.Text = "转换后序列号前缀";
             this.afterTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -186,11 +190,10 @@
             this.afterTransSNPre.BackColor = System.Drawing.Color.White;
             this.afterTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.afterTransSNPre.ID = null;
-            this.afterTransSNPre.Location = new System.Drawing.Point(581, 95);
-            this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.afterTransSNPre.Location = new System.Drawing.Point(872, 142);
             this.afterTransSNPre.Name = "afterTransSNPre";
             this.afterTransSNPre.Power = null;
-            this.afterTransSNPre.Size = new System.Drawing.Size(168, 25);
+            this.afterTransSNPre.Size = new System.Drawing.Size(250, 34);
             this.afterTransSNPre.Str = null;
             this.afterTransSNPre.Str1 = null;
             this.afterTransSNPre.Str2 = null;
@@ -202,11 +205,10 @@
             this.beforeTransSNPre.BackColor = System.Drawing.Color.White;
             this.beforeTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.beforeTransSNPre.ID = null;
-            this.beforeTransSNPre.Location = new System.Drawing.Point(581, 62);
-            this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.beforeTransSNPre.Location = new System.Drawing.Point(872, 93);
             this.beforeTransSNPre.Name = "beforeTransSNPre";
             this.beforeTransSNPre.Power = null;
-            this.beforeTransSNPre.Size = new System.Drawing.Size(168, 25);
+            this.beforeTransSNPre.Size = new System.Drawing.Size(250, 34);
             this.beforeTransSNPre.Str = null;
             this.beforeTransSNPre.Str1 = null;
             this.beforeTransSNPre.Str2 = null;
@@ -216,10 +218,10 @@
             // 
             this.ms_makecode_lock.AutoSize = true;
             this.ms_makecode_lock.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_lock.Location = new System.Drawing.Point(20, 17);
-            this.ms_makecode_lock.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ms_makecode_lock.LeaveEvent = false;
+            this.ms_makecode_lock.Location = new System.Drawing.Point(30, 26);
             this.ms_makecode_lock.Name = "ms_makecode_lock";
-            this.ms_makecode_lock.Size = new System.Drawing.Size(51, 21);
+            this.ms_makecode_lock.Size = new System.Drawing.Size(72, 28);
             this.ms_makecode_lock.TabIndex = 80;
             this.ms_makecode_lock.Text = "锁定";
             this.ms_makecode_lock.UseVisualStyleBackColor = true;
@@ -227,9 +229,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(20, 141);
+            this.OperateResult.Location = new System.Drawing.Point(30, 212);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(812, 287);
+            this.OperateResult.Size = new System.Drawing.Size(1216, 428);
             this.OperateResult.TabIndex = 78;
             this.OperateResult.Text = "";
             // 
@@ -237,11 +240,13 @@
             // 
             this.sncode.AllPower = "ifall";
             this.sncode.BackColor = System.Drawing.Color.White;
+            this.sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(95, 441);
+            this.sncode.Location = new System.Drawing.Point(142, 662);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sncode.Name = "sncode";
             this.sncode.Power = "ifwrite";
-            this.sncode.Size = new System.Drawing.Size(160, 21);
+            this.sncode.Size = new System.Drawing.Size(238, 34);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -256,12 +261,13 @@
             this.ReCall.DownImage = ((System.Drawing.Image)(resources.GetObject("ReCall.DownImage")));
             this.ReCall.Image = ((System.Drawing.Image)(resources.GetObject("ReCall.Image")));
             this.ReCall.IsShowBorder = true;
-            this.ReCall.Location = new System.Drawing.Point(438, 479);
+            this.ReCall.Location = new System.Drawing.Point(657, 718);
+            this.ReCall.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ReCall.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReCall.MoveImage")));
             this.ReCall.Name = "ReCall";
             this.ReCall.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReCall.NormalImage")));
             this.ReCall.Power = null;
-            this.ReCall.Size = new System.Drawing.Size(70, 24);
+            this.ReCall.Size = new System.Drawing.Size(105, 36);
             this.ReCall.TabIndex = 74;
             this.ReCall.Text = "撤销输入";
             this.ReCall.UseVisualStyleBackColor = true;
@@ -274,12 +280,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(340, 479);
+            this.Confirm.Location = new System.Drawing.Point(510, 718);
+            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(70, 24);
+            this.Confirm.Size = new System.Drawing.Size(105, 36);
             this.Confirm.TabIndex = 73;
             this.Confirm.Tag = "IfWrite";
             this.Confirm.Text = "确认";
@@ -288,29 +295,29 @@
             // 
             // beforeTransSNLength
             // 
-            this.beforeTransSNLength.Location = new System.Drawing.Point(165, 65);
-            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.beforeTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.beforeTransSNLength.Location = new System.Drawing.Point(269, 90);
             this.beforeTransSNLength.Name = "beforeTransSNLength";
-            this.beforeTransSNLength.Size = new System.Drawing.Size(168, 21);
+            this.beforeTransSNLength.Size = new System.Drawing.Size(250, 34);
             this.beforeTransSNLength.TabIndex = 89;
             this.beforeTransSNLength.Text = "0";
             // 
             // afterTransSNLength
             // 
-            this.afterTransSNLength.Location = new System.Drawing.Point(165, 99);
-            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.afterTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.afterTransSNLength.Location = new System.Drawing.Point(269, 140);
             this.afterTransSNLength.Name = "afterTransSNLength";
-            this.afterTransSNLength.Size = new System.Drawing.Size(168, 21);
+            this.afterTransSNLength.Size = new System.Drawing.Size(250, 34);
             this.afterTransSNLength.TabIndex = 90;
             this.afterTransSNLength.Text = "0";
             // 
             // changenum
             // 
             this.changenum.Enabled = false;
-            this.changenum.Location = new System.Drawing.Point(553, 441);
-            this.changenum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.changenum.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.changenum.Location = new System.Drawing.Point(830, 662);
             this.changenum.Name = "changenum";
-            this.changenum.Size = new System.Drawing.Size(137, 21);
+            this.changenum.Size = new System.Drawing.Size(204, 34);
             this.changenum.TabIndex = 91;
             this.changenum.Text = "0";
             // 
@@ -321,21 +328,22 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(76, 16);
+            this.ma_code.Location = new System.Drawing.Point(114, 24);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(163, 22);
+            this.ma_code.Size = new System.Drawing.Size(244, 33);
             this.ma_code.TabIndex = 92;
             this.ma_code.TableName = null;
             this.ma_code.TextBoxEnable = false;
             // 
             // Make_SeqTransform
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(849, 512);
+            this.ClientSize = new System.Drawing.Size(1274, 768);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.changenum);
             this.Controls.Add(this.afterTransSNLength);
@@ -360,6 +368,7 @@
             this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_SeqTransform";
             this.Tag = "Make!SeqTransform";
             this.Text = " ";

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -94,6 +94,7 @@ namespace UAS_MES.Make
                                         }
                                         break;
                                     case CheckState.Unchecked:
+
                                         string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
                                         //为空，就说明，没有进行过序列号的转换
                                         if (beforesn == "" || beforesn == null)
@@ -218,88 +219,7 @@ namespace UAS_MES.Make
         /// <param name="e"></param>
         private void ms_makecode_KeyDown(object sender, KeyEventArgs e)
         {
-            if (e.KeyCode == Keys.Enter)
-            {
-                //查询表工单序列号防呆规则表
-                dt = (DataTable)dh.ExecuteSql("select msr_type, msr_prefix ,msr_length from makesnrule where msr_makecode='" + ma_code.Text+"'", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    foreach (DataRow dr in dt.Rows)
-                    {
-                        //如果有值，则这个字段自动勾选，并且不可编辑
-                        if (dr["msr_type"].ToString().ToLower() == "before")
-                        {
-                            //msr_type=before 的值赋值到转换前
 
-                            //临时变量记录
-                            string length = dr["msr_length"].ToString();
-                            string prefix = dr["msr_prefix"].ToString();
-                            //不为空
-                            if (prefix != "" && prefix != null)
-                            {
-                                //则赋值
-                                beforeTransSNPre.Text = prefix;
-                                //设置不可编辑
-                                beforeTransSNPre.ReadOnly = true;
-                                //勾选
-                                beforeTransSNPre_checkBox.Checked = true;
-                            }
-                            if (length != "" && length != null)
-                            {
-                                //赋值
-                                beforeTransSNLength.Text = length;
-                                //设置不可编辑
-                                beforeTransSNLength.ReadOnly = true;
-                                //勾选
-                                beforeTransSNLength_checkBox.Checked = true;
-                            }
-                        }
-                        else if (dr["msr_type"].ToString().ToLower() == "after")
-                        {
-                            //msr_type=after 的值赋值到转换后
-
-                            //临时变量记录
-                            string length = dr["msr_length"].ToString();
-                            string prefix = dr["msr_prefix"].ToString();
-                            //不为空
-                            if (prefix != "" && prefix != null)
-                            {
-                                //则赋值
-                                afterTransSNPre.Text = prefix;
-                                //设置不可编辑
-                                afterTransSNPre.ReadOnly = true;
-                                //勾选
-                                afterTransSNPre_checkBox.Checked = true;
-                            }
-                            if (length != "" && length != null)
-                            {
-                                //赋值
-                                afterTransSNLength.Text = length;
-                                //设置不可编辑
-                                afterTransSNLength.ReadOnly = true;
-                                //勾选
-                                afterTransSNLength_checkBox.Checked = true;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    /*	如果转换前没有值，则取 select productsnrule where psr_prodcode=? 产品编号，
-                     *	有值则赋值到 转换前，并且自动勾选不可编辑。*/
-                    //dt = (DataTable)dh.ExecuteSql("select psr_prefix ,psr_length from productsnrule where psr_prodcode = " + ma_prodcode.Text, "select");
-                    //if (dt.Rows.Count > 0)
-                    //{
-                    //    //将产品序列号防呆规则查出的数据填充
-                    //    beforeTransSNPre.Text = dt.Rows[0]["psr_prefix"].ToString();
-                    //    beforeTransSNPre.ReadOnly = true;
-                    //    beforeTransSNPre_checkBox.Checked = true;
-                    //    beforeTransSNLength.Text = dt.Rows[0]["psr_length"].ToString();
-                    //    beforeTransSNLength.ReadOnly = true;
-                    //    beforeTransSNLength_checkBox.Checked = true;
-                    //}
-                }
-            }
         }
         /// <summary>
         /// 如果清空了工单号，或者更换了工单号则将 ： 转换前序列号长度，转换前序列号前缀
@@ -320,6 +240,92 @@ namespace UAS_MES.Make
             beforeTransSNLength_checkBox.Checked = false;
             afterTransSNPre_checkBox.Checked = false;
             afterTransSNLength_checkBox.Checked = false;
+
+            //设置可编辑
+            beforeTransSNLength.Enabled = true;
+            beforeTransSNPre.Enabled = true;
+            afterTransSNLength.Enabled = true;
+            afterTransSNPre.Enabled = true;
+
+            //查询表工单序列号防呆规则表
+            dt = (DataTable)dh.ExecuteSql("select msr_type, msr_prefix ,msr_length from makesnrule where msr_makecode='" + ma_code.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                foreach (DataRow dr in dt.Rows)
+                {
+                    //如果有值，则这个字段自动勾选，并且不可编辑
+                    if (dr["msr_type"].ToString().ToLower() == "before")
+                    {
+                        //msr_type=before 的值赋值到转换前
+
+                        //临时变量记录
+                        string length = dr["msr_length"].ToString();
+                        string prefix = dr["msr_prefix"].ToString();
+                        //不为空
+                        if (prefix != "" && prefix != null)
+                        {
+                            //则赋值
+                            beforeTransSNPre.Text = prefix;
+                            //设置不可编辑
+                            beforeTransSNPre.Enabled = false;
+                            //勾选
+                            beforeTransSNPre_checkBox.Checked = true;
+                        }
+                        if (length != "" && length != null)
+                        {
+                            //赋值
+                            beforeTransSNLength.Text = length;
+                            //设置不可编辑
+                            beforeTransSNLength.Enabled = false;
+                            //勾选
+                            beforeTransSNLength_checkBox.Checked = true;
+                        }
+                    }
+                    else if (dr["msr_type"].ToString().ToLower() == "after")
+                    {
+                        //msr_type=after 的值赋值到转换后
+
+                        //临时变量记录
+                        string length = dr["msr_length"].ToString();
+                        string prefix = dr["msr_prefix"].ToString();
+                        //不为空
+                        if (prefix != "" && prefix != null)
+                        {
+                            //则赋值
+                            afterTransSNPre.Text = prefix;
+                            //设置不可编辑
+                            afterTransSNPre.Enabled = false;
+                            //勾选
+                            afterTransSNPre_checkBox.Checked = true;
+                        }
+                        if (length != "" && length != null)
+                        {
+                            //赋值
+                            afterTransSNLength.Text = length;
+                            //设置不可编辑
+                            afterTransSNLength.Enabled = false;
+                            //勾选
+                            afterTransSNLength_checkBox.Checked = true;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                /*	如果转换前没有值，则取 select productsnrule where psr_prodcode=? 产品编号，
+                 *	有值则赋值到 转换前，并且自动勾选不可编辑。*/
+                //dt = (DataTable)dh.ExecuteSql("select psr_prefix ,psr_length from productsnrule where psr_prodcode = " + ma_prodcode.Text, "select");
+                //if (dt.Rows.Count > 0)
+                //{
+                //    //将产品序列号防呆规则查出的数据填充
+                //    beforeTransSNPre.Text = dt.Rows[0]["psr_prefix"].ToString();
+                //    beforeTransSNPre.ReadOnly = true;
+                //    beforeTransSNPre_checkBox.Checked = true;
+                //    beforeTransSNLength.Text = dt.Rows[0]["psr_length"].ToString();
+                //    beforeTransSNLength.ReadOnly = true;
+                //    beforeTransSNLength_checkBox.Checked = true;
+                //}
+            }
         }
         /// <summary>
         /// 检验长度或者前缀是否合法

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

@@ -47,6 +47,7 @@
             this.ob_maxngacceptqty_label = new System.Windows.Forms.Label();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.label5 = new System.Windows.Forms.Label();
+            this.ob_status_label = new System.Windows.Forms.Label();
             this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -71,7 +72,6 @@
             this.WithdrawRejection = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.BatchPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_status_label = new System.Windows.Forms.Label();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -217,7 +217,7 @@
             this.panel2.Location = new System.Drawing.Point(0, 0);
             this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1309, 38);
+            this.panel2.Size = new System.Drawing.Size(1300, 38);
             this.panel2.TabIndex = 220;
             this.panel2.Tag = "NoAuto";
             // 
@@ -275,6 +275,17 @@
             this.label5.TabIndex = 226;
             this.label5.Text = "备注";
             // 
+            // ob_status_label
+            // 
+            this.ob_status_label.AutoSize = true;
+            this.ob_status_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_status_label.Location = new System.Drawing.Point(680, 246);
+            this.ob_status_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_status_label.Name = "ob_status_label";
+            this.ob_status_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_status_label.TabIndex = 232;
+            this.ob_status_label.Text = "批次状态";
+            // 
             // ob_status
             // 
             this.ob_status.AllPower = null;
@@ -692,22 +703,11 @@
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
-            // ob_status_label
-            // 
-            this.ob_status_label.AutoSize = true;
-            this.ob_status_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_status_label.Location = new System.Drawing.Point(680, 246);
-            this.ob_status_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_status_label.Name = "ob_status_label";
-            this.ob_status_label.Size = new System.Drawing.Size(92, 27);
-            this.ob_status_label.TabIndex = 232;
-            this.ob_status_label.Text = "批次状态";
-            // 
             // OQC_BatchResultJudge
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1309, 706);
+            this.ClientSize = new System.Drawing.Size(1300, 706);
             this.Controls.Add(this.ob_status_label);
             this.Controls.Add(this.ob_status);
             this.Controls.Add(this.ob_maxngacceptqty);

UAS-MES/Login.cs

@@ -94,7 +94,7 @@ namespace UAS_MES
                 {
                     this.Hide();
                     SetInf();//设置User的全局变量
-
+                    //记录登陆信息
                     try
                     {
                         IPHostEntry IpEntry = Dns.GetHostEntry(Dns.GetHostName());

UAS-MES/Properties/Settings.Designer.cs

@@ -47,18 +47,6 @@ namespace UAS_MES.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("ftp://192.168.253.9/MESSetting/|mesconfig|Administrator1@#")]
-        public string FTPAddress {
-            get {
-                return ((string)(this["FTPAddress"]));
-            }
-            set {
-                this["FTPAddress"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
@@ -129,5 +117,17 @@ namespace UAS_MES.Properties {
                 this["BaudRate"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("ftp://172.16.11.99/print/|uasmes|Administrator1@#")]
+        public string FTPAddress {
+            get {
+                return ((string)(this["FTPAddress"]));
+            }
+            set {
+                this["FTPAddress"] = value;
+            }
+        }
     }
 }

UAS-MES/Properties/Settings.settings

@@ -8,9 +8,6 @@
     <Setting Name="LastLoginUser" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="FTPAddress" Type="System.String" Scope="User">
-      <Value Profile="(Default)">ftp://192.168.253.9/MESSetting/|mesconfig|Administrator1@#</Value>
-    </Setting>
     <Setting Name="LastLoginSob" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
@@ -29,5 +26,8 @@
     <Setting Name="BaudRate" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="FTPAddress" Type="System.String" Scope="User">
+      <Value Profile="(Default)">ftp://172.16.11.99/print/|uasmes|Administrator1@#</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

UAS-MES/PublicMethod/LogicHandler.cs

@@ -533,7 +533,7 @@ namespace UAS_MES.PublicMethod
             oMakeCode = "";
             oErrorMessage = "";
             string ms_id = dh.getFieldDataByCondition("MakeSerial", "max(ms_id) ms_id", "ms_sncode='" + iSnCode + "' or ms_firstsn in (select firstsn from makesnrelation where sn='" + iSnCode + "')").ToString();
-            oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id=" + ms_id).ToString();
+            oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id+"'").ToString();
             if (oMakeCode != "")
                 return true;
             else
@@ -842,17 +842,17 @@ namespace UAS_MES.PublicMethod
         /// 保存Mac地址和BT地址
         /// </summary>
         /// <param name="iSN"></param>
-        /// <param name="iWIFI"></param>
+        /// <param name="iMac"></param>
         /// <param name="iBT"></param>
         /// <param name="iCode1"></param>
         /// <param name="iCode2"></param>
         /// <param name="iCode3"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
-        public static bool SetAddressInfo(string iSN, string iWIFI, string iBT, string iCode1, string iCode2, string iCode3, out string oErrorMessage)
+        public static bool SetAddressInfo(string iSN, string iMac, string iBT, string iCode1, string iCode2, string iCode3, out string oErrorMessage)
         {
             oErrorMessage = "";
-            string[] param = new string[] { iSN, iWIFI, iBT, iCode1, iCode2, iCode3, oErrorMessage };
+            string[] param = new string[] { iSN, iMac, iBT, iCode1, iCode2, iCode3, oErrorMessage };
             dh.CallProcedure("CS_SETADDRESSINFO", ref param);
             oErrorMessage = param[6];
             if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
@@ -952,12 +952,12 @@ namespace UAS_MES.PublicMethod
         /// <param name="iID3"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
-        public static bool SetIMEIInfo(string iSnCode, string iMakeCode, string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNetCode, string iPSN, string iID1, string iID2, string iID3, out string oErrMessage)
+        public static bool SetIMEIInfo(string iSnCode,string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNetCode, string iPSN, string iID1, string iID2, string iID3, out string oErrMessage)
         {
             oErrMessage = "";
-            string[] param = new string[] { iSnCode, iMakeCode, iIMEI1, iIMEI2, iIMEI3, iMEID, iNetCode, iPSN, iID1, iID2, iID3, oErrMessage };
+            string[] param = new string[] { iSnCode, iIMEI1, iIMEI2, iIMEI3, iMEID, iNetCode, iPSN, iID1, iID2, iID3, oErrMessage };
             dh.CallProcedure("CS_SETIMEIINFO", ref param);
-            oErrMessage = param[11];
+            oErrMessage = param[10];
             if (oErrMessage == "" || oErrMessage == null)
                 return true;
             else