返工数据采集界面修改

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

@@ -84,9 +84,9 @@
             this.groupBoxWithBorder1.Controls.Add(this.ma_qty_label);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBoxWithBorder1.Location = new System.Drawing.Point(9, 10);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2);
             this.groupBoxWithBorder1.Size = new System.Drawing.Size(818, 146);
             this.groupBoxWithBorder1.TabIndex = 0;
             this.groupBoxWithBorder1.TabStop = false;
@@ -97,7 +97,7 @@
             // 
             this.ma_id.AutoSize = true;
             this.ma_id.CutLength = null;
-            this.ma_id.Location = new System.Drawing.Point(594, 112);
+            this.ma_id.Location = new System.Drawing.Point(593, 111);
             this.ma_id.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_id.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_id.Name = "ma_id";
@@ -109,7 +109,7 @@
             // 
             this.ma_craftcode.AutoSize = true;
             this.ma_craftcode.CutLength = null;
-            this.ma_craftcode.Location = new System.Drawing.Point(539, 112);
+            this.ma_craftcode.Location = new System.Drawing.Point(538, 111);
             this.ma_craftcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_craftcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_craftcode.Name = "ma_craftcode";
@@ -120,8 +120,9 @@
             // ma_saveimei
             // 
             this.ma_saveimei.AutoSize = true;
-            this.ma_saveimei.Location = new System.Drawing.Point(313, 110);
-            this.ma_saveimei.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ma_saveimei.Enabled = false;
+            this.ma_saveimei.Location = new System.Drawing.Point(312, 109);
+            this.ma_saveimei.Margin = new System.Windows.Forms.Padding(2);
             this.ma_saveimei.Name = "ma_saveimei";
             this.ma_saveimei.Power = null;
             this.ma_saveimei.Size = new System.Drawing.Size(199, 25);
@@ -132,8 +133,9 @@
             // ma_savemacbt
             // 
             this.ma_savemacbt.AutoSize = true;
-            this.ma_savemacbt.Location = new System.Drawing.Point(31, 110);
-            this.ma_savemacbt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ma_savemacbt.Enabled = false;
+            this.ma_savemacbt.Location = new System.Drawing.Point(30, 109);
+            this.ma_savemacbt.Margin = new System.Windows.Forms.Padding(2);
             this.ma_savemacbt.Name = "ma_savemacbt";
             this.ma_savemacbt.Power = null;
             this.ma_savemacbt.Size = new System.Drawing.Size(189, 25);
@@ -146,8 +148,8 @@
             this.LockCheckBox.AutoSize = true;
             this.LockCheckBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LockCheckBox.LeaveEvent = false;
-            this.LockCheckBox.Location = new System.Drawing.Point(241, 35);
-            this.LockCheckBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.LockCheckBox.Location = new System.Drawing.Point(240, 34);
+            this.LockCheckBox.Margin = new System.Windows.Forms.Padding(2);
             this.LockCheckBox.Name = "LockCheckBox";
             this.LockCheckBox.Size = new System.Drawing.Size(51, 21);
             this.LockCheckBox.TabIndex = 12;
@@ -157,7 +159,7 @@
             // ma_code_label
             // 
             this.ma_code_label.AutoSize = true;
-            this.ma_code_label.Location = new System.Drawing.Point(27, 32);
+            this.ma_code_label.Location = new System.Drawing.Point(26, 31);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_code_label.Name = "ma_code_label";
             this.ma_code_label.Size = new System.Drawing.Size(74, 21);
@@ -173,7 +175,7 @@
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ma_code.FormName = null;
             this.ma_code.Location = new System.Drawing.Point(115, 34);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(2);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
@@ -189,7 +191,7 @@
             // 
             this.getsnqty.AutoSize = true;
             this.getsnqty.CutLength = null;
-            this.getsnqty.Location = new System.Drawing.Point(619, 30);
+            this.getsnqty.Location = new System.Drawing.Point(618, 29);
             this.getsnqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.getsnqty.MaximumSize = new System.Drawing.Size(150, 0);
             this.getsnqty.Name = "getsnqty";
@@ -200,7 +202,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
-            this.pr_code.Location = new System.Drawing.Point(110, 75);
+            this.pr_code.Location = new System.Drawing.Point(109, 74);
             this.pr_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_code.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_code.Name = "pr_code";
@@ -212,7 +214,7 @@
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
-            this.ma_qty.Location = new System.Drawing.Point(391, 30);
+            this.ma_qty.Location = new System.Drawing.Point(390, 29);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_qty.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_qty.Name = "ma_qty";
@@ -223,7 +225,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
-            this.pr_detail.Location = new System.Drawing.Point(391, 75);
+            this.pr_detail.Location = new System.Drawing.Point(390, 74);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_detail.Name = "pr_detail";
@@ -233,7 +235,7 @@
             // pr_code_label
             // 
             this.pr_code_label.AutoSize = true;
-            this.pr_code_label.Location = new System.Drawing.Point(27, 75);
+            this.pr_code_label.Location = new System.Drawing.Point(26, 74);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(74, 21);
@@ -243,7 +245,7 @@
             // getsnqty_label
             // 
             this.getsnqty_label.AutoSize = true;
-            this.getsnqty_label.Location = new System.Drawing.Point(539, 30);
+            this.getsnqty_label.Location = new System.Drawing.Point(538, 29);
             this.getsnqty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.getsnqty_label.Name = "getsnqty_label";
             this.getsnqty_label.Size = new System.Drawing.Size(74, 21);
@@ -253,7 +255,7 @@
             // pr_detail_label
             // 
             this.pr_detail_label.AutoSize = true;
-            this.pr_detail_label.Location = new System.Drawing.Point(309, 75);
+            this.pr_detail_label.Location = new System.Drawing.Point(308, 74);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
@@ -263,7 +265,7 @@
             // ma_qty_label
             // 
             this.ma_qty_label.AutoSize = true;
-            this.ma_qty_label.Location = new System.Drawing.Point(309, 30);
+            this.ma_qty_label.Location = new System.Drawing.Point(308, 29);
             this.ma_qty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_qty_label.Name = "ma_qty_label";
             this.ma_qty_label.Size = new System.Drawing.Size(74, 21);
@@ -282,9 +284,9 @@
             this.groupBoxWithBorder2.Controls.Add(this.PrinterList);
             this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBoxWithBorder2.Location = new System.Drawing.Point(9, 161);
-            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2);
             this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2);
             this.groupBoxWithBorder2.Size = new System.Drawing.Size(402, 142);
             this.groupBoxWithBorder2.TabIndex = 13;
             this.groupBoxWithBorder2.TabStop = false;
@@ -294,7 +296,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(225, 110);
+            this.label2.Location = new System.Drawing.Point(224, 109);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(74, 21);
@@ -305,7 +307,7 @@
             // 
             this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PrintNum.Location = new System.Drawing.Point(302, 111);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(2);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Size = new System.Drawing.Size(90, 23);
             this.PrintNum.TabIndex = 17;
@@ -321,7 +323,7 @@
             this.PrintLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PrintLabel.FormattingEnabled = true;
             this.PrintLabel.Location = new System.Drawing.Point(106, 74);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(190, 25);
             this.PrintLabel.TabIndex = 16;
@@ -330,7 +332,7 @@
             // PrintLabel_label
             // 
             this.PrintLabel_label.AutoSize = true;
-            this.PrintLabel_label.Location = new System.Drawing.Point(13, 75);
+            this.PrintLabel_label.Location = new System.Drawing.Point(12, 74);
             this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
             this.PrintLabel_label.Size = new System.Drawing.Size(74, 21);
@@ -349,7 +351,7 @@
             // PrinterList_label
             // 
             this.PrinterList_label.AutoSize = true;
-            this.PrinterList_label.Location = new System.Drawing.Point(13, 30);
+            this.PrinterList_label.Location = new System.Drawing.Point(12, 29);
             this.PrinterList_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.PrinterList_label.Name = "PrinterList_label";
             this.PrinterList_label.Size = new System.Drawing.Size(90, 21);
@@ -369,7 +371,7 @@
             // 
             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(9, 307);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(2);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(819, 171);
             this.OperateResult.TabIndex = 14;
@@ -384,9 +386,9 @@
             this.groupBoxWithBorder3.Controls.Add(this.sn_code);
             this.groupBoxWithBorder3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBoxWithBorder3.Location = new System.Drawing.Point(9, 482);
-            this.groupBoxWithBorder3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder3.Margin = new System.Windows.Forms.Padding(2);
             this.groupBoxWithBorder3.Name = "groupBoxWithBorder3";
-            this.groupBoxWithBorder3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder3.Padding = new System.Windows.Forms.Padding(2);
             this.groupBoxWithBorder3.Size = new System.Drawing.Size(818, 62);
             this.groupBoxWithBorder3.TabIndex = 14;
             this.groupBoxWithBorder3.TabStop = false;
@@ -396,8 +398,8 @@
             // ReWorkAsRelateTSN
             // 
             this.ReWorkAsRelateTSN.AutoSize = true;
-            this.ReWorkAsRelateTSN.Location = new System.Drawing.Point(489, 24);
-            this.ReWorkAsRelateTSN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ReWorkAsRelateTSN.Location = new System.Drawing.Point(488, 23);
+            this.ReWorkAsRelateTSN.Margin = new System.Windows.Forms.Padding(2);
             this.ReWorkAsRelateTSN.Name = "ReWorkAsRelateTSN";
             this.ReWorkAsRelateTSN.Size = new System.Drawing.Size(177, 25);
             this.ReWorkAsRelateTSN.TabIndex = 15;
@@ -409,8 +411,8 @@
             // 
             this.ReWorkAsCurrentSN.AutoSize = true;
             this.ReWorkAsCurrentSN.Checked = true;
-            this.ReWorkAsCurrentSN.Location = new System.Drawing.Point(348, 24);
-            this.ReWorkAsCurrentSN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ReWorkAsCurrentSN.Location = new System.Drawing.Point(347, 23);
+            this.ReWorkAsCurrentSN.Margin = new System.Windows.Forms.Padding(2);
             this.ReWorkAsCurrentSN.Name = "ReWorkAsCurrentSN";
             this.ReWorkAsCurrentSN.Size = new System.Drawing.Size(124, 25);
             this.ReWorkAsCurrentSN.TabIndex = 14;
@@ -421,7 +423,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(41, 25);
+            this.label1.Location = new System.Drawing.Point(40, 24);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(58, 21);
@@ -435,7 +437,7 @@
             this.sn_code.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.sn_code.ID = null;
             this.sn_code.Location = new System.Drawing.Point(115, 26);
-            this.sn_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(2);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
             this.sn_code.Size = new System.Drawing.Size(148, 23);
@@ -455,7 +457,7 @@
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "Make_GetReMakeSN";
             this.Tag = "Make!GetReMakeSN";
             this.Text = "返工数据采集";