字段名称修改

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

@@ -84,10 +84,9 @@
             // 
             this.ma_code_label.AutoSize = true;
             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.Location = new System.Drawing.Point(31, 242);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(115, 32);
+            this.ma_code_label.Size = new System.Drawing.Size(92, 27);
             this.ma_code_label.TabIndex = 97;
             this.ma_code_label.Text = "制造单号";
             // 
@@ -95,20 +94,18 @@
             // 
             this.mcd_okqty.AutoSize = true;
             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.Location = new System.Drawing.Point(105, 487);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(0, 32);
+            this.mcd_okqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_okqty.TabIndex = 94;
             // 
             // mcd_okqty_label
             // 
             this.mcd_okqty_label.AutoSize = true;
             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.Location = new System.Drawing.Point(31, 487);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(71, 32);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(57, 27);
             this.mcd_okqty_label.TabIndex = 92;
             this.mcd_okqty_label.Text = "已称:";
             // 
@@ -119,31 +116,32 @@
             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(562, 95);
-            this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel6.Location = new System.Drawing.Point(422, 76);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(537, 156);
+            this.panel6.Size = new System.Drawing.Size(403, 125);
             this.panel6.TabIndex = 90;
             // 
             // pr_cartongw
             // 
             this.pr_cartongw.AutoSize = true;
+            this.pr_cartongw.CutLength = null;
             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.Location = new System.Drawing.Point(154, 73);
+            this.pr_cartongw.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_cartongw.Name = "pr_cartongw";
-            this.pr_cartongw.Size = new System.Drawing.Size(0, 32);
+            this.pr_cartongw.Size = new System.Drawing.Size(0, 27);
             this.pr_cartongw.TabIndex = 80;
             this.pr_cartongw.Tag = "1";
             // 
             // pr_code
             // 
             this.pr_code.AutoSize = true;
+            this.pr_code.CutLength = null;
             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.Location = new System.Drawing.Point(154, 22);
+            this.pr_code.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 32);
+            this.pr_code.Size = new System.Drawing.Size(0, 27);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
@@ -152,10 +150,9 @@
             // 
             this.pr_cartongw_label.AutoSize = true;
             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.Location = new System.Drawing.Point(28, 73);
             this.pr_cartongw_label.Name = "pr_cartongw_label";
-            this.pr_cartongw_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_cartongw_label.Size = new System.Drawing.Size(92, 27);
             this.pr_cartongw_label.TabIndex = 42;
             this.pr_cartongw_label.Text = "标准重量";
             // 
@@ -163,10 +160,9 @@
             // 
             this.pr_code_label.AutoSize = true;
             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.Location = new System.Drawing.Point(27, 22);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -176,10 +172,9 @@
             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(33, 95);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel4.Location = new System.Drawing.Point(25, 76);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(495, 156);
+            this.panel4.Size = new System.Drawing.Size(372, 125);
             this.panel4.TabIndex = 91;
             // 
             // pr_cartonunit
@@ -188,10 +183,9 @@
             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(409, 64);
-            this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_cartonunit.Location = new System.Drawing.Point(307, 51);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(38, 31);
+            this.pr_cartonunit.Size = new System.Drawing.Size(31, 25);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             // 
@@ -201,10 +195,9 @@
             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(20, 64);
-            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label22.Location = new System.Drawing.Point(15, 51);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
+            this.label22.Size = new System.Drawing.Size(50, 25);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -216,20 +209,18 @@
             this.weight.AutoSize = true;
             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(139, 54);
-            this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight.Location = new System.Drawing.Point(104, 43);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 50);
+            this.weight.Size = new System.Drawing.Size(0, 39);
             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(25, 26);
-            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label15.Location = new System.Drawing.Point(19, 21);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(107, 39);
+            this.label15.Size = new System.Drawing.Size(86, 31);
             this.label15.TabIndex = 85;
             this.label15.Text = "条码号";
             // 
@@ -237,21 +228,19 @@
             // 
             this.pr_detail_label.AutoSize = true;
             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.Location = new System.Drawing.Point(31, 366);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 82;
-            this.pr_detail_label.Text = "产品型号";
+            this.pr_detail_label.Text = "产品名称";
             // 
             // ma_qty_label
             // 
             this.ma_qty_label.AutoSize = true;
             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.Location = new System.Drawing.Point(31, 430);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(115, 32);
+            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
             this.ma_qty_label.TabIndex = 84;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -259,10 +248,9 @@
             // 
             this.ma_salecode_label.AutoSize = true;
             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.Location = new System.Drawing.Point(31, 301);
             this.ma_salecode_label.Name = "ma_salecode_label";
-            this.ma_salecode_label.Size = new System.Drawing.Size(115, 32);
+            this.ma_salecode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_salecode_label.TabIndex = 83;
             this.ma_salecode_label.Text = "订单编号";
             // 
@@ -270,10 +258,9 @@
             // 
             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(687, 271);
-            this.Search_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Search_label.Location = new System.Drawing.Point(515, 217);
             this.Search_label.Name = "Search_label";
-            this.Search_label.Size = new System.Drawing.Size(92, 27);
+            this.Search_label.Size = new System.Drawing.Size(74, 21);
             this.Search_label.TabIndex = 105;
             this.Search_label.Text = "查找历史";
             // 
@@ -282,10 +269,9 @@
             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(1166, 212);
-            this.PriLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PriLabel.Location = new System.Drawing.Point(874, 170);
             this.PriLabel.Name = "PriLabel";
-            this.PriLabel.Size = new System.Drawing.Size(113, 31);
+            this.PriLabel.Size = new System.Drawing.Size(92, 25);
             this.PriLabel.TabIndex = 154;
             this.PriLabel.TabStop = true;
             this.PriLabel.Text = "打印标签";
@@ -295,10 +281,9 @@
             // 
             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(1296, 212);
-            this.SupPriLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SupPriLabel.Location = new System.Drawing.Point(972, 170);
             this.SupPriLabel.Name = "SupPriLabel";
-            this.SupPriLabel.Size = new System.Drawing.Size(113, 31);
+            this.SupPriLabel.Size = new System.Drawing.Size(92, 25);
             this.SupPriLabel.TabIndex = 155;
             this.SupPriLabel.Text = "补打标签";
             this.SupPriLabel.UseVisualStyleBackColor = true;
@@ -307,20 +292,18 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1248, 166);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PrintLabel.Location = new System.Drawing.Point(936, 133);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(160, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(121, 20);
             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(1113, 124);
-            this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Printer_label.Location = new System.Drawing.Point(835, 99);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(107, 25);
+            this.Printer_label.Size = new System.Drawing.Size(84, 20);
             this.Printer_label.TabIndex = 159;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -328,10 +311,9 @@
             // 
             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(1172, 80);
-            this.ComList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ComList_label.Location = new System.Drawing.Point(879, 64);
             this.ComList_label.Name = "ComList_label";
-            this.ComList_label.Size = new System.Drawing.Size(50, 25);
+            this.ComList_label.Size = new System.Drawing.Size(39, 20);
             this.ComList_label.TabIndex = 160;
             this.ComList_label.Text = "串口";
             // 
@@ -339,19 +321,18 @@
             // 
             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(1132, 164);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(849, 131);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(88, 25);
+            this.label1.Size = new System.Drawing.Size(69, 20);
             this.label1.TabIndex = 161;
             this.label1.Text = "打印标签";
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1248, 124);
-            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Printer.Location = new System.Drawing.Point(936, 99);
+            this.Printer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(160, 28);
+            this.Printer.Size = new System.Drawing.Size(120, 22);
             this.Printer.TabIndex = 158;
             // 
             // StartWeight
@@ -361,13 +342,12 @@
             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(872, 36);
-            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.StartWeight.Location = new System.Drawing.Point(654, 29);
             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(100, 30);
+            this.StartWeight.Size = new System.Drawing.Size(75, 24);
             this.StartWeight.TabIndex = 156;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -380,13 +360,12 @@
             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(1309, 269);
-            this.Cancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Cancel.Location = new System.Drawing.Point(982, 215);
             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(100, 29);
+            this.Cancel.Size = new System.Drawing.Size(75, 23);
             this.Cancel.TabIndex = 153;
             this.Cancel.Text = "取消";
             this.Cancel.UseVisualStyleBackColor = true;
@@ -399,13 +378,12 @@
             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(1166, 268);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Confirm.Location = new System.Drawing.Point(874, 214);
             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(100, 29);
+            this.Confirm.Size = new System.Drawing.Size(75, 23);
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "打印";
             this.Confirm.UseVisualStyleBackColor = true;
@@ -414,10 +392,11 @@
             // pd_barcode
             // 
             this.pd_barcode.AutoSize = true;
-            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.CutLength = null;
+            this.pd_barcode.Location = new System.Drawing.Point(934, 14);
+            this.pd_barcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pd_barcode.Name = "pd_barcode";
-            this.pd_barcode.Size = new System.Drawing.Size(87, 15);
+            this.pd_barcode.Size = new System.Drawing.Size(65, 12);
             this.pd_barcode.TabIndex = 107;
             this.pd_barcode.Text = "pd_barcode";
             this.pd_barcode.Visible = false;
@@ -429,13 +408,13 @@
             this.Search.Condition = null;
             this.Search.DBTitle = "查找历史";
             this.Search.FormName = null;
-            this.Search.Location = new System.Drawing.Point(811, 271);
-            this.Search.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Search.Location = new System.Drawing.Point(608, 217);
             this.Search.Name = "Search";
             this.Search.Power = null;
+            this.Search.ReturnData = null;
             this.Search.SelectField = null;
             this.Search.SetValueField = null;
-            this.Search.Size = new System.Drawing.Size(288, 26);
+            this.Search.Size = new System.Drawing.Size(216, 21);
             this.Search.TabIndex = 104;
             this.Search.TableName = null;
             this.Search.TextBoxEnable = false;
@@ -449,11 +428,10 @@
             this.pa_weight,
             this.weight_time,
             this.user});
-            this.dataGridViewWithSerialNum1.Location = new System.Drawing.Point(562, 316);
-            this.dataGridViewWithSerialNum1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dataGridViewWithSerialNum1.Location = new System.Drawing.Point(422, 253);
             this.dataGridViewWithSerialNum1.Name = "dataGridViewWithSerialNum1";
             this.dataGridViewWithSerialNum1.RowTemplate.Height = 23;
-            this.dataGridViewWithSerialNum1.Size = new System.Drawing.Size(537, 332);
+            this.dataGridViewWithSerialNum1.Size = new System.Drawing.Size(403, 266);
             this.dataGridViewWithSerialNum1.TabIndex = 103;
             // 
             // pa_outboxcode
@@ -483,13 +461,12 @@
             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, 36);
-            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.StopWeight.Location = new System.Drawing.Point(749, 29);
             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(100, 30);
+            this.StopWeight.Size = new System.Drawing.Size(75, 24);
             this.StopWeight.TabIndex = 102;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -498,42 +475,46 @@
             // ma_code
             // 
             this.ma_code.AutoSize = true;
+            this.ma_code.CutLength = null;
             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.Location = new System.Drawing.Point(141, 249);
+            this.ma_code.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 32);
+            this.ma_code.Size = new System.Drawing.Size(0, 27);
             this.ma_code.TabIndex = 101;
             this.ma_code.Tag = "1";
             // 
             // ma_qty
             // 
             this.ma_qty.AutoSize = true;
+            this.ma_qty.CutLength = null;
             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.Location = new System.Drawing.Point(141, 437);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 32);
+            this.ma_qty.Size = new System.Drawing.Size(0, 27);
             this.ma_qty.TabIndex = 100;
             // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
+            this.pr_detail.CutLength = null;
             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.Location = new System.Drawing.Point(141, 373);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 32);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 99;
             // 
             // ma_salecode
             // 
             this.ma_salecode.AutoSize = true;
+            this.ma_salecode.CutLength = null;
             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.Location = new System.Drawing.Point(141, 308);
+            this.ma_salecode.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_salecode.Name = "ma_salecode";
-            this.ma_salecode.Size = new System.Drawing.Size(0, 32);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 27);
             this.ma_salecode.TabIndex = 98;
             // 
             // Clean
@@ -543,13 +524,12 @@
             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(1225, 717);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Location = new System.Drawing.Point(919, 574);
             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(100, 30);
+            this.Clean.Size = new System.Drawing.Size(75, 24);
             this.Clean.TabIndex = 89;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -561,8 +541,7 @@
             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(33, 69);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.normalButton1.Location = new System.Drawing.Point(25, 55);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -578,11 +557,10 @@
             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(148, 26);
-            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.outboxcode.Location = new System.Drawing.Point(111, 21);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = null;
-            this.outboxcode.Size = new System.Drawing.Size(721, 47);
+            this.outboxcode.Size = new System.Drawing.Size(542, 39);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -592,19 +570,18 @@
             // 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(1124, 316);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Location = new System.Drawing.Point(843, 253);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(297, 376);
+            this.OperateResult.Size = new System.Drawing.Size(224, 302);
             this.OperateResult.TabIndex = 87;
             this.OperateResult.Text = "";
             // 
             // ComList
             // 
-            this.ComList.Location = new System.Drawing.Point(1248, 80);
-            this.ComList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ComList.Location = new System.Drawing.Point(936, 64);
+            this.ComList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(161, 25);
+            this.ComList.Size = new System.Drawing.Size(121, 20);
             this.ComList.TabIndex = 162;
             // 
             // BaudRate
@@ -612,12 +589,11 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(1249, 36);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.BaudRate.Location = new System.Drawing.Point(937, 29);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
             this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(159, 25);
+            this.BaudRate.Size = new System.Drawing.Size(120, 21);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -627,18 +603,17 @@
             // 
             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(1152, 36);
-            this.BaudRate_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.BaudRate_label.Location = new System.Drawing.Point(864, 29);
             this.BaudRate_label.Name = "BaudRate_label";
-            this.BaudRate_label.Size = new System.Drawing.Size(69, 25);
+            this.BaudRate_label.Size = new System.Drawing.Size(54, 20);
             this.BaudRate_label.TabIndex = 167;
             this.BaudRate_label.Text = "波特率";
             // 
             // Make_CartonBoxWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1430, 760);
+            this.ClientSize = new System.Drawing.Size(1072, 608);
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.BaudRate_label);
             this.Controls.Add(this.ComList);
@@ -675,19 +650,18 @@
             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(true);
+            this.panel6.ResumeLayout(false);
             this.panel6.PerformLayout();
-            this.panel4.ResumeLayout(true);
+            this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewWithSerialNum1)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.resx

@@ -523,18 +523,6 @@
   <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