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

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

@@ -51,7 +51,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(49, 31);
+            this.label1.Location = new System.Drawing.Point(49, 27);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
@@ -61,7 +61,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label2.Location = new System.Drawing.Point(52, 95);
+            this.label2.Location = new System.Drawing.Point(52, 92);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 1;
@@ -71,7 +71,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label3.Location = new System.Drawing.Point(376, 95);
+            this.label3.Location = new System.Drawing.Point(376, 92);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(52, 27);
             this.label3.TabIndex = 2;
@@ -81,7 +81,7 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(814, 97);
+            this.PrintLabel.Location = new System.Drawing.Point(814, 92);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(169, 23);
@@ -128,7 +128,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label6.Location = new System.Drawing.Point(551, 461);
+            this.label6.Location = new System.Drawing.Point(551, 458);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(52, 27);
             this.label6.TabIndex = 189;
@@ -158,7 +158,7 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(629, 461);
+            this.PrintNum.Location = new System.Drawing.Point(629, 458);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
@@ -177,7 +177,7 @@
             this.printButton.DownImage = ((System.Drawing.Image)(resources.GetObject("printButton.DownImage")));
             this.printButton.Image = null;
             this.printButton.IsShowBorder = true;
-            this.printButton.Location = new System.Drawing.Point(851, 459);
+            this.printButton.Location = new System.Drawing.Point(827, 458);
             this.printButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.printButton.MoveImage = ((System.Drawing.Image)(resources.GetObject("printButton.MoveImage")));
             this.printButton.Name = "printButton";
@@ -195,7 +195,7 @@
             this.pr_code.BackColor = System.Drawing.Color.White;
             this.pr_code.Font = new System.Drawing.Font("宋体", 9F);
             this.pr_code.ID = null;
-            this.pr_code.Location = new System.Drawing.Point(160, 33);
+            this.pr_code.Location = new System.Drawing.Point(160, 27);
             this.pr_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
@@ -214,8 +214,8 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.inputText.BackColor = System.Drawing.Color.White;
             this.inputText.ID = null;
-            this.inputText.Location = new System.Drawing.Point(148, 461);
-            this.inputText.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.inputText.Location = new System.Drawing.Point(148, 458);
+            this.inputText.Margin = new System.Windows.Forms.Padding(4);
             this.inputText.Name = "inputText";
             this.inputText.Power = null;
             this.inputText.Size = new System.Drawing.Size(260, 25);
@@ -230,7 +230,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(44, 135);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(940, 296);
             this.OperateResult.TabIndex = 186;
@@ -238,8 +238,8 @@
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(814, 31);
-            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Printer.Location = new System.Drawing.Point(814, 27);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5);
             this.Printer.Name = "Printer";
             this.Printer.Size = new System.Drawing.Size(169, 31);
             this.Printer.TabIndex = 182;
@@ -273,7 +273,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_CustomLabelPrint_FormClosing);
             this.Load += new System.EventHandler(this.Make_CustomLablePrint_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CustomLabelPrint_SizeChanged);
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

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

@@ -67,18 +67,20 @@
             // ms_makecode
             // 
             this.ms_makecode.AutoSize = true;
-            this.ms_makecode.Location = new System.Drawing.Point(559, 362);
+            this.ms_makecode.Location = new System.Drawing.Point(745, 452);
+            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, 12);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 15);
             this.ms_makecode.TabIndex = 218;
             this.ms_makecode.Visible = false;
             // 
             // pr_code
             // 
             this.pr_code.AutoSize = true;
-            this.pr_code.Location = new System.Drawing.Point(449, 362);
+            this.pr_code.Location = new System.Drawing.Point(599, 452);
+            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, 12);
+            this.pr_code.Size = new System.Drawing.Size(0, 15);
             this.pr_code.TabIndex = 217;
             this.pr_code.Visible = false;
             // 
@@ -95,11 +97,12 @@
             this.pr_detail,
             this.md_code,
             this.MD_DOWNMAN});
-            this.LabelDataGridView.Location = new System.Drawing.Point(22, 88);
+            this.LabelDataGridView.Location = new System.Drawing.Point(29, 110);
+            this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.LabelDataGridView.Name = "LabelDataGridView";
             this.LabelDataGridView.RowHeadersVisible = false;
             this.LabelDataGridView.RowTemplate.Height = 23;
-            this.LabelDataGridView.Size = new System.Drawing.Size(837, 199);
+            this.LabelDataGridView.Size = new System.Drawing.Size(1116, 249);
             this.LabelDataGridView.TabIndex = 213;
             this.LabelDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellValueChanged);
             this.LabelDataGridView.CurrentCellDirtyStateChanged += new System.EventHandler(this.LabelDataGridView_CurrentCellDirtyStateChanged);
@@ -170,10 +173,9 @@
             // 
             this.md_reson.AutoSize = true;
             this.md_reson.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.md_reson.Location = new System.Drawing.Point(11, 322);
-            this.md_reson.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.md_reson.Location = new System.Drawing.Point(15, 402);
             this.md_reson.Name = "md_reson";
-            this.md_reson.Size = new System.Drawing.Size(106, 21);
+            this.md_reson.Size = new System.Drawing.Size(132, 27);
             this.md_reson.TabIndex = 211;
             this.md_reson.Text = "取消下地原因";
             // 
@@ -181,10 +183,9 @@
             // 
             this.count_label.AutoSize = true;
             this.count_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.count_label.Location = new System.Drawing.Point(497, 16);
-            this.count_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.count_label.Location = new System.Drawing.Point(663, 20);
             this.count_label.Name = "count_label";
-            this.count_label.Size = new System.Drawing.Size(42, 21);
+            this.count_label.Size = new System.Drawing.Size(52, 27);
             this.count_label.TabIndex = 209;
             this.count_label.Text = "数量";
             // 
@@ -192,9 +193,10 @@
             // 
             this.md_code_rb.AutoSize = true;
             this.md_code_rb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.md_code_rb.Location = new System.Drawing.Point(22, 12);
+            this.md_code_rb.Location = new System.Drawing.Point(29, 15);
+            this.md_code_rb.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.md_code_rb.Name = "md_code_rb";
-            this.md_code_rb.Size = new System.Drawing.Size(76, 25);
+            this.md_code_rb.Size = new System.Drawing.Size(93, 31);
             this.md_code_rb.TabIndex = 221;
             this.md_code_rb.TabStop = true;
             this.md_code_rb.Text = "事件号";
@@ -205,9 +207,10 @@
             // 
             this.sn_code_rb.AutoSize = true;
             this.sn_code_rb.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_rb.Location = new System.Drawing.Point(22, 55);
+            this.sn_code_rb.Location = new System.Drawing.Point(29, 69);
+            this.sn_code_rb.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sn_code_rb.Name = "sn_code_rb";
-            this.sn_code_rb.Size = new System.Drawing.Size(76, 25);
+            this.sn_code_rb.Size = new System.Drawing.Size(93, 31);
             this.sn_code_rb.TabIndex = 222;
             this.sn_code_rb.TabStop = true;
             this.sn_code_rb.Text = "序列号";
@@ -218,10 +221,9 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(89, 293);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Location = new System.Drawing.Point(119, 366);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(42, 21);
+            this.label1.Size = new System.Drawing.Size(52, 27);
             this.label1.TabIndex = 224;
             this.label1.Text = "总数";
             // 
@@ -229,10 +231,9 @@
             // 
             this.已选.AutoSize = true;
             this.已选.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.已选.Location = new System.Drawing.Point(196, 294);
-            this.已选.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.已选.Location = new System.Drawing.Point(261, 368);
             this.已选.Name = "已选";
-            this.已选.Size = new System.Drawing.Size(42, 21);
+            this.已选.Size = new System.Drawing.Size(52, 27);
             this.已选.TabIndex = 226;
             this.已选.Text = "已选";
             // 
@@ -306,10 +307,11 @@
             this.make_count.AutoSize = true;
             this.make_count.CutLength = null;
             this.make_count.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.make_count.Location = new System.Drawing.Point(544, 16);
-            this.make_count.MaximumSize = new System.Drawing.Size(200, 0);
+            this.make_count.Location = new System.Drawing.Point(736, 20);
+            this.make_count.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.make_count.MaximumSize = new System.Drawing.Size(267, 0);
             this.make_count.Name = "make_count";
-            this.make_count.Size = new System.Drawing.Size(0, 21);
+            this.make_count.Size = new System.Drawing.Size(0, 27);
             this.make_count.TabIndex = 230;
             // 
             // choosenum
@@ -317,10 +319,11 @@
             this.choosenum.AutoSize = true;
             this.choosenum.CutLength = null;
             this.choosenum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.choosenum.Location = new System.Drawing.Point(238, 294);
-            this.choosenum.MaximumSize = new System.Drawing.Size(200, 0);
+            this.choosenum.Location = new System.Drawing.Point(329, 368);
+            this.choosenum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.choosenum.MaximumSize = new System.Drawing.Size(267, 0);
             this.choosenum.Name = "choosenum";
-            this.choosenum.Size = new System.Drawing.Size(0, 21);
+            this.choosenum.Size = new System.Drawing.Size(0, 27);
             this.choosenum.TabIndex = 229;
             // 
             // sum
@@ -328,17 +331,19 @@
             this.sum.AutoSize = true;
             this.sum.CutLength = null;
             this.sum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sum.Location = new System.Drawing.Point(136, 293);
-            this.sum.MaximumSize = new System.Drawing.Size(200, 0);
+            this.sum.Location = new System.Drawing.Point(185, 366);
+            this.sum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sum.MaximumSize = new System.Drawing.Size(267, 0);
             this.sum.Name = "sum";
-            this.sum.Size = new System.Drawing.Size(0, 21);
+            this.sum.Size = new System.Drawing.Size(0, 27);
             this.sum.TabIndex = 228;
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(22, 293);
+            this.ChooseAll.Location = new System.Drawing.Point(29, 366);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(38, 20);
+            this.ChooseAll.Size = new System.Drawing.Size(51, 25);
             this.ChooseAll.TabIndex = 223;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
@@ -348,10 +353,11 @@
             this.mdcode.AllPower = null;
             this.mdcode.BackColor = System.Drawing.Color.White;
             this.mdcode.ID = null;
-            this.mdcode.Location = new System.Drawing.Point(93, 16);
+            this.mdcode.Location = new System.Drawing.Point(145, 20);
+            this.mdcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.mdcode.Name = "mdcode";
             this.mdcode.Power = null;
-            this.mdcode.Size = new System.Drawing.Size(196, 21);
+            this.mdcode.Size = new System.Drawing.Size(260, 25);
             this.mdcode.Str = null;
             this.mdcode.Str1 = null;
             this.mdcode.Str2 = null;
@@ -365,12 +371,13 @@
             this.Sure.DownImage = ((System.Drawing.Image)(resources.GetObject("Sure.DownImage")));
             this.Sure.Image = null;
             this.Sure.IsShowBorder = true;
-            this.Sure.Location = new System.Drawing.Point(262, 493);
+            this.Sure.Location = new System.Drawing.Point(349, 616);
+            this.Sure.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Sure.MoveImage = ((System.Drawing.Image)(resources.GetObject("Sure.MoveImage")));
             this.Sure.Name = "Sure";
             this.Sure.NormalImage = ((System.Drawing.Image)(resources.GetObject("Sure.NormalImage")));
             this.Sure.Power = null;
-            this.Sure.Size = new System.Drawing.Size(75, 28);
+            this.Sure.Size = new System.Drawing.Size(100, 35);
             this.Sure.TabIndex = 219;
             this.Sure.Text = "确认";
             this.Sure.UseVisualStyleBackColor = false;
@@ -379,9 +386,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(435, 322);
+            this.OperateResult.Location = new System.Drawing.Point(580, 402);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(412, 199);
+            this.OperateResult.Size = new System.Drawing.Size(548, 248);
             this.OperateResult.TabIndex = 216;
             this.OperateResult.Text = "";
             // 
@@ -390,10 +398,11 @@
             this.sn_code.AllPower = null;
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(93, 61);
+            this.sn_code.Location = new System.Drawing.Point(145, 76);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(196, 21);
+            this.sn_code.Size = new System.Drawing.Size(260, 25);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -403,18 +412,19 @@
             // inputreson
             // 
             this.inputreson.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inputreson.Location = new System.Drawing.Point(122, 322);
+            this.inputreson.Location = new System.Drawing.Point(163, 402);
+            this.inputreson.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.inputreson.Name = "inputreson";
             this.inputreson.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
-            this.inputreson.Size = new System.Drawing.Size(295, 124);
+            this.inputreson.Size = new System.Drawing.Size(392, 154);
             this.inputreson.TabIndex = 212;
             this.inputreson.Text = "";
             // 
             // Make_MakeCancelDown
             // 
-            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(872, 533);
+            this.ClientSize = new System.Drawing.Size(1163, 666);
             this.Controls.Add(this.make_count);
             this.Controls.Add(this.choosenum);
             this.Controls.Add(this.sum);
@@ -434,13 +444,14 @@
             this.Controls.Add(this.md_reson);
             this.Controls.Add(this.count_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_MakeCancelDown";
             this.Tag = "Make!MakeCancelDown";
             this.Text = "Make_MakeCancelDown";
             this.Load += new System.EventHandler(this.Make_MakeCancelDown_Load);
             this.SizeChanged += new System.EventHandler(this.Make_MakeCancelDown_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_MakeCancelDown.resx

@@ -138,6 +138,27 @@
   <metadata name="MD_DOWNMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_macode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MD_DOWNMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Sure.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

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

@@ -625,7 +625,7 @@
             this.ForceRejection.Enabled = false;
             this.ForceRejection.Image = ((System.Drawing.Image)(resources.GetObject("ForceRejection.Image")));
             this.ForceRejection.IsShowBorder = true;
-            this.ForceRejection.Location = new System.Drawing.Point(393, 660);
+            this.ForceRejection.Location = new System.Drawing.Point(393, 658);
             this.ForceRejection.Margin = new System.Windows.Forms.Padding(4);
             this.ForceRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.MoveImage")));
             this.ForceRejection.Name = "ForceRejection";
@@ -645,7 +645,7 @@
             this.WithdrawRejection.Enabled = false;
             this.WithdrawRejection.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.Image")));
             this.WithdrawRejection.IsShowBorder = true;
-            this.WithdrawRejection.Location = new System.Drawing.Point(580, 660);
+            this.WithdrawRejection.Location = new System.Drawing.Point(580, 658);
             this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(4);
             this.WithdrawRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.MoveImage")));
             this.WithdrawRejection.Name = "WithdrawRejection";

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

@@ -77,7 +77,7 @@
             // 
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(701, 61);
+            this.ms_sncode_label.Location = new System.Drawing.Point(689, 61);
             this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
@@ -124,7 +124,7 @@
             // 
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(357, 59);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(352, 59);
             this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
             this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
@@ -135,7 +135,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(704, 110);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(692, 110);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(72, 27);
@@ -146,7 +146,7 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(28, 105);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(28, 110);
             this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
             this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
@@ -157,7 +157,7 @@
             // 
             this.ob_remark_label.AutoSize = true;
             this.ob_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_remark_label.Location = new System.Drawing.Point(345, 74);
+            this.ob_remark_label.Location = new System.Drawing.Point(389, 74);
             this.ob_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_remark_label.Name = "ob_remark_label";
             this.ob_remark_label.Size = new System.Drawing.Size(52, 27);
@@ -168,7 +168,7 @@
             // 
             this.ob_maxacceptqty_label.AutoSize = true;
             this.ob_maxacceptqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_maxacceptqty_label.Location = new System.Drawing.Point(345, 22);
+            this.ob_maxacceptqty_label.Location = new System.Drawing.Point(389, 22);
             this.ob_maxacceptqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_maxacceptqty_label.Name = "ob_maxacceptqty_label";
             this.ob_maxacceptqty_label.Size = new System.Drawing.Size(212, 27);
@@ -190,7 +190,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(1031, 110);
+            this.label1.Location = new System.Drawing.Point(1019, 110);
             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);
@@ -201,7 +201,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(357, 105);
+            this.pr_detail_label.Location = new System.Drawing.Point(352, 110);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 188;
@@ -229,7 +229,7 @@
             this.ob_maxngacceptqty.AllPower = null;
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.ID = null;
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(585, 22);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(629, 22);
             this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = null;
@@ -242,7 +242,7 @@
             // 
             // ob_sampleqty
             // 
-            this.ob_sampleqty.Location = new System.Drawing.Point(100, 74);
+            this.ob_sampleqty.Location = new System.Drawing.Point(118, 74);
             this.ob_sampleqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_sampleqty.Name = "ob_sampleqty";
             this.ob_sampleqty.Size = new System.Drawing.Size(204, 25);
@@ -266,7 +266,7 @@
             this.ob_remark.AllPower = null;
             this.ob_remark.BackColor = System.Drawing.Color.White;
             this.ob_remark.ID = null;
-            this.ob_remark.Location = new System.Drawing.Point(585, 74);
+            this.ob_remark.Location = new System.Drawing.Point(629, 74);
             this.ob_remark.Margin = new System.Windows.Forms.Padding(4);
             this.ob_remark.Name = "ob_remark";
             this.ob_remark.Power = null;
@@ -284,7 +284,7 @@
             this.al_code.Condition = null;
             this.al_code.DBTitle = null;
             this.al_code.FormName = null;
-            this.al_code.Location = new System.Drawing.Point(101, 25);
+            this.al_code.Location = new System.Drawing.Point(119, 25);
             this.al_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.al_code.Name = "al_code";
             this.al_code.Power = null;
@@ -304,7 +304,7 @@
             this.pr_detail.BackColor = System.Drawing.Color.White;
             this.pr_detail.Enabled = false;
             this.pr_detail.ID = null;
-            this.pr_detail.Location = new System.Drawing.Point(461, 110);
+            this.pr_detail.Location = new System.Drawing.Point(458, 110);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Power = null;
@@ -394,7 +394,7 @@
             this.GetBatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(1036, 64);
+            this.GetBatch.Location = new System.Drawing.Point(1024, 64);
             this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
@@ -514,7 +514,7 @@
             this.ob_nowcheckqty.BackColor = System.Drawing.Color.White;
             this.ob_nowcheckqty.Enabled = false;
             this.ob_nowcheckqty.ID = null;
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(811, 110);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(795, 110);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
@@ -531,7 +531,7 @@
             this.obd_outboxcode.AllPower = null;
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(463, 61);
+            this.obd_outboxcode.Location = new System.Drawing.Point(458, 61);
             this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
@@ -565,7 +565,7 @@
             this.ms_sncode.AllPower = null;
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(811, 64);
+            this.ms_sncode.Location = new System.Drawing.Point(795, 64);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.resx

@@ -526,4 +526,19 @@
   <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_kind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

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

@@ -30,7 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OQC_SamplingDataCollection));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.ob_checkno_label = new System.Windows.Forms.Label();
             this.obd_outboxcode_label = new System.Windows.Forms.Label();
             this.ms_sncode_label = new System.Windows.Forms.Label();
@@ -335,7 +335,7 @@
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.ID = null;
             this.ob_maxngacceptqty.Location = new System.Drawing.Point(860, 51);
-            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = null;
             this.ob_maxngacceptqty.Size = new System.Drawing.Size(193, 25);
@@ -352,7 +352,7 @@
             this.ob_aqlcode.Enabled = false;
             this.ob_aqlcode.ID = null;
             this.ob_aqlcode.Location = new System.Drawing.Point(1211, 9);
-            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
             this.ob_aqlcode.Size = new System.Drawing.Size(193, 25);
@@ -369,7 +369,7 @@
             this.ob_projectcode.Enabled = false;
             this.ob_projectcode.ID = null;
             this.ob_projectcode.Location = new System.Drawing.Point(860, 132);
-            this.ob_projectcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_projectcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_projectcode.Name = "ob_projectcode";
             this.ob_projectcode.Power = null;
             this.ob_projectcode.Size = new System.Drawing.Size(193, 25);
@@ -388,7 +388,7 @@
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
             this.Clean.Location = new System.Drawing.Point(1349, 711);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
@@ -404,7 +404,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(916, 588);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(425, 153);
             this.OperateResult.TabIndex = 210;
@@ -417,7 +417,7 @@
             this.ob_prodcode.Enabled = false;
             this.ob_prodcode.ID = null;
             this.ob_prodcode.Location = new System.Drawing.Point(460, 164);
-            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
             this.ob_prodcode.Size = new System.Drawing.Size(153, 25);
@@ -434,7 +434,7 @@
             this.ob_makecode.Enabled = false;
             this.ob_makecode.ID = null;
             this.ob_makecode.Location = new System.Drawing.Point(127, 164);
-            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_makecode.Name = "ob_makecode";
             this.ob_makecode.Power = null;
             this.ob_makecode.Size = new System.Drawing.Size(153, 25);
@@ -454,7 +454,7 @@
             this.bc_code1,
             this.bc_name1});
             this.ChoosedDGV.Location = new System.Drawing.Point(1080, 255);
-            this.ChoosedDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChoosedDGV.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedDGV.Name = "ChoosedDGV";
             this.ChoosedDGV.RowHeadersWidth = 20;
             this.ChoosedDGV.RowTemplate.Height = 23;
@@ -502,7 +502,7 @@
             this.bc_code,
             this.bc_name});
             this.WaitChooseDGV.Location = new System.Drawing.Point(629, 255);
-            this.WaitChooseDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WaitChooseDGV.Margin = new System.Windows.Forms.Padding(4);
             this.WaitChooseDGV.Name = "WaitChooseDGV";
             this.WaitChooseDGV.RowHeadersWidth = 20;
             this.WaitChooseDGV.RowTemplate.Height = 23;
@@ -548,7 +548,7 @@
             this.ob_remark.BackColor = System.Drawing.Color.White;
             this.ob_remark.ID = null;
             this.ob_remark.Location = new System.Drawing.Point(123, 709);
-            this.ob_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_remark.Margin = new System.Windows.Forms.Padding(4);
             this.ob_remark.Name = "ob_remark";
             this.ob_remark.Power = null;
             this.ob_remark.Size = new System.Drawing.Size(487, 25);
@@ -564,7 +564,7 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
             this.sncode.Location = new System.Drawing.Point(123, 668);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
             this.sncode.Size = new System.Drawing.Size(487, 25);
@@ -590,7 +590,7 @@
             this.ois_remark,
             this.ois_status});
             this.CheckTypeDGV.Location = new System.Drawing.Point(21, 214);
-            this.CheckTypeDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.CheckTypeDGV.Margin = new System.Windows.Forms.Padding(4);
             this.CheckTypeDGV.Name = "CheckTypeDGV";
             this.CheckTypeDGV.RowHeadersWidth = 20;
             this.CheckTypeDGV.RowTemplate.Height = 23;
@@ -619,8 +619,8 @@
             // 
             this.ci_name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.ci_name.DataPropertyName = "ci_name";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.ci_name.DefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.ci_name.DefaultCellStyle = dataGridViewCellStyle3;
             this.ci_name.HeaderText = "项目名称";
             this.ci_name.Name = "ci_name";
             this.ci_name.ReadOnly = true;
@@ -679,7 +679,7 @@
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
             this.ChooseedReject.Location = new System.Drawing.Point(1000, 369);
-            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseedReject.Name = "ChooseedReject";
             this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
             this.ChooseedReject.TabIndex = 195;
@@ -690,7 +690,7 @@
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
             this.WaitReject.Location = new System.Drawing.Point(1000, 442);
-            this.WaitReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(4);
             this.WaitReject.Name = "WaitReject";
             this.WaitReject.Size = new System.Drawing.Size(67, 29);
             this.WaitReject.TabIndex = 194;
@@ -704,7 +704,7 @@
             this.oi_checkqty1.Enabled = false;
             this.oi_checkqty1.ID = null;
             this.oi_checkqty1.Location = new System.Drawing.Point(1211, 91);
-            this.oi_checkqty1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.oi_checkqty1.Margin = new System.Windows.Forms.Padding(4);
             this.oi_checkqty1.Name = "oi_checkqty1";
             this.oi_checkqty1.Power = null;
             this.oi_checkqty1.Size = new System.Drawing.Size(195, 25);
@@ -721,7 +721,7 @@
             this.ob_okqty.Enabled = false;
             this.ob_okqty.ID = null;
             this.ob_okqty.Location = new System.Drawing.Point(1211, 132);
-            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_okqty.Name = "ob_okqty";
             this.ob_okqty.Power = null;
             this.ob_okqty.Size = new System.Drawing.Size(195, 25);
@@ -738,7 +738,7 @@
             this.ob_ngqty.Enabled = false;
             this.ob_ngqty.ID = null;
             this.ob_ngqty.Location = new System.Drawing.Point(1211, 175);
-            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_ngqty.Name = "ob_ngqty";
             this.ob_ngqty.Power = null;
             this.ob_ngqty.Size = new System.Drawing.Size(195, 25);
@@ -755,7 +755,7 @@
             this.ob_nowcheckqty.Enabled = false;
             this.ob_nowcheckqty.ID = null;
             this.ob_nowcheckqty.Location = new System.Drawing.Point(1211, 52);
-            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
             this.ob_nowcheckqty.Size = new System.Drawing.Size(195, 25);
@@ -771,7 +771,7 @@
             this.bccode.BackColor = System.Drawing.Color.White;
             this.bccode.ID = null;
             this.bccode.Location = new System.Drawing.Point(1211, 219);
-            this.bccode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bccode.Margin = new System.Windows.Forms.Padding(4);
             this.bccode.Name = "bccode";
             this.bccode.Power = null;
             this.bccode.Size = new System.Drawing.Size(195, 25);
@@ -791,12 +791,12 @@
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
             this.GetBatch.Location = new System.Drawing.Point(629, 118);
-            this.GetBatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifRead";
-            this.GetBatch.Size = new System.Drawing.Size(80, 30);
+            this.GetBatch.Size = new System.Drawing.Size(60, 30);
             this.GetBatch.TabIndex = 175;
             this.GetBatch.Tag = "IFREAD";
             this.GetBatch.Text = "获取批";
@@ -811,13 +811,13 @@
             this.BatchPass.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.BatchPass.Image = ((System.Drawing.Image)(resources.GetObject("BatchPass.Image")));
             this.BatchPass.IsShowBorder = true;
-            this.BatchPass.Location = new System.Drawing.Point(720, 119);
-            this.BatchPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.BatchPass.Location = new System.Drawing.Point(719, 119);
+            this.BatchPass.Margin = new System.Windows.Forms.Padding(4);
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
             this.BatchPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.NormalImage")));
             this.BatchPass.Power = "ifread";
-            this.BatchPass.Size = new System.Drawing.Size(80, 30);
+            this.BatchPass.Size = new System.Drawing.Size(60, 30);
             this.BatchPass.TabIndex = 174;
             this.BatchPass.Tag = "OQC!Inspection";
             this.BatchPass.Text = "批判过";
@@ -833,7 +833,7 @@
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
             this.Confirm.Location = new System.Drawing.Point(629, 709);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
@@ -851,7 +851,7 @@
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
             this.ob_checkno.Location = new System.Drawing.Point(127, 36);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "ifread";
             this.ob_checkno.Size = new System.Drawing.Size(487, 25);
@@ -868,7 +868,7 @@
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
             this.obd_outboxcode.Location = new System.Drawing.Point(127, 76);
-            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
             this.obd_outboxcode.Size = new System.Drawing.Size(487, 25);
@@ -885,7 +885,7 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
             this.ms_sncode.Location = new System.Drawing.Point(127, 119);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "ifread";
             this.ms_sncode.Size = new System.Drawing.Size(487, 25);
@@ -949,7 +949,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             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(699, 174);
+            this.label2.Location = new System.Drawing.Point(686, 174);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(52, 27);
@@ -1007,7 +1007,7 @@
             this.Controls.Add(this.ms_sncode);
             this.Controls.Add(this.ms_sncode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OQC_SamplingDataCollection";
             this.Tag = "OQC!SamplingDataCollection";
             this.Text = " ";
@@ -1018,7 +1018,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfoSource)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.resx

@@ -261,6 +261,30 @@
   <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="or_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bg_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ChooseAll.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bg_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ChooseAll.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -300,6 +324,33 @@
   <metadata name="ois_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_itemcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_checkqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_ng.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_leveldefect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ois_remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ois_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="ChooseedReject.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACUAAAAXCAYAAACMLIalAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.Designer.cs

@@ -69,17 +69,19 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(14, 464);
+            this.sn_code_label.Location = new System.Drawing.Point(19, 580);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
+            this.sn_code_label.Size = new System.Drawing.Size(72, 27);
             this.sn_code_label.TabIndex = 176;
             this.sn_code_label.Text = "序列号";
             // 
             // 清除
             // 
-            this.清除.Location = new System.Drawing.Point(849, 462);
+            this.清除.Location = new System.Drawing.Point(1132, 578);
+            this.清除.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.清除.Name = "清除";
-            this.清除.Size = new System.Drawing.Size(48, 23);
+            this.清除.Size = new System.Drawing.Size(64, 29);
             this.清除.TabIndex = 178;
             this.清除.Text = "清除";
             this.清除.UseVisualStyleBackColor = true;
@@ -90,10 +92,11 @@
             this.sn_code.AllPower = null;
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(81, 466);
+            this.sn_code.Location = new System.Drawing.Point(108, 582);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(196, 21);
+            this.sn_code.Size = new System.Drawing.Size(260, 25);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -103,9 +106,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(9, 185);
+            this.OperateResult.Location = new System.Drawing.Point(12, 231);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(889, 272);
+            this.OperateResult.Size = new System.Drawing.Size(1184, 339);
             this.OperateResult.TabIndex = 175;
             this.OperateResult.Text = "";
             // 
@@ -122,11 +126,11 @@
             this.groupBoxWithBorder2.Controls.Add(this.newpack);
             this.groupBoxWithBorder2.Controls.Add(this.movepack);
             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(455, 10);
-            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(607, 12);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(446, 157);
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(595, 196);
             this.groupBoxWithBorder2.TabIndex = 174;
             this.groupBoxWithBorder2.TabStop = false;
             this.groupBoxWithBorder2.Text = "转移箱";
@@ -139,12 +143,13 @@
             this.ALLMOVE.DownImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.DownImage")));
             this.ALLMOVE.Image = null;
             this.ALLMOVE.IsShowBorder = true;
-            this.ALLMOVE.Location = new System.Drawing.Point(273, 115);
+            this.ALLMOVE.Location = new System.Drawing.Point(376, 144);
+            this.ALLMOVE.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ALLMOVE.MoveImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.MoveImage")));
             this.ALLMOVE.Name = "ALLMOVE";
             this.ALLMOVE.NormalImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.NormalImage")));
             this.ALLMOVE.Power = null;
-            this.ALLMOVE.Size = new System.Drawing.Size(70, 25);
+            this.ALLMOVE.Size = new System.Drawing.Size(93, 31);
             this.ALLMOVE.TabIndex = 179;
             this.ALLMOVE.Text = "全部移箱";
             this.ALLMOVE.UseVisualStyleBackColor = false;
@@ -156,11 +161,12 @@
             this.pa_standardqty.BackColor = System.Drawing.Color.White;
             this.pa_standardqty.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.pa_standardqty.ID = null;
-            this.pa_standardqty.Location = new System.Drawing.Point(121, 117);
+            this.pa_standardqty.Location = new System.Drawing.Point(148, 147);
+            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pa_standardqty.Name = "pa_standardqty";
             this.pa_standardqty.Negative = false;
             this.pa_standardqty.Power = null;
-            this.pa_standardqty.Size = new System.Drawing.Size(150, 23);
+            this.pa_standardqty.Size = new System.Drawing.Size(199, 27);
             this.pa_standardqty.Str = null;
             this.pa_standardqty.Str1 = null;
             this.pa_standardqty.Str2 = null;
@@ -170,36 +176,40 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.CutLength = null;
-            this.pa_currentqty.Location = new System.Drawing.Point(348, 59);
-            this.pa_currentqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_currentqty.Location = new System.Drawing.Point(484, 77);
+            this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_currentqty.MaximumSize = new System.Drawing.Size(267, 0);
             this.pa_currentqty.Name = "pa_currentqty";
-            this.pa_currentqty.Size = new System.Drawing.Size(0, 21);
+            this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
             this.pa_currentqty.TabIndex = 173;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(272, 61);
+            this.label4.Location = new System.Drawing.Point(377, 77);
+            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 = 6;
             this.label4.Text = "箱内数量";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(33, 113);
+            this.label3.Location = new System.Drawing.Point(30, 147);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.TabIndex = 5;
             this.label3.Text = "标准容量";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(33, 59);
+            this.label2.Location = new System.Drawing.Point(30, 79);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 4;
             this.label2.Text = "目标箱号";
             // 
@@ -209,10 +219,11 @@
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(121, 62);
+            this.pa_outboxcode.Location = new System.Drawing.Point(148, 79);
+            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = null;
-            this.pa_outboxcode.Size = new System.Drawing.Size(150, 23);
+            this.pa_outboxcode.Size = new System.Drawing.Size(199, 27);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
             this.pa_outboxcode.Str2 = null;
@@ -222,9 +233,10 @@
             // newpack
             // 
             this.newpack.AutoSize = true;
-            this.newpack.Location = new System.Drawing.Point(137, 24);
+            this.newpack.Location = new System.Drawing.Point(168, 30);
+            this.newpack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.newpack.Name = "newpack";
-            this.newpack.Size = new System.Drawing.Size(60, 25);
+            this.newpack.Size = new System.Drawing.Size(73, 31);
             this.newpack.TabIndex = 1;
             this.newpack.TabStop = true;
             this.newpack.Text = "新箱";
@@ -234,9 +246,10 @@
             // movepack
             // 
             this.movepack.AutoSize = true;
-            this.movepack.Location = new System.Drawing.Point(37, 24);
+            this.movepack.Location = new System.Drawing.Point(35, 30);
+            this.movepack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.movepack.Name = "movepack";
-            this.movepack.Size = new System.Drawing.Size(60, 25);
+            this.movepack.Size = new System.Drawing.Size(73, 31);
             this.movepack.TabIndex = 0;
             this.movepack.TabStop = true;
             this.movepack.Text = "移箱";
@@ -264,11 +277,11 @@
             this.groupBoxWithBorder1.Controls.Add(this.pr_outboxinnerqty_label);
             this.groupBoxWithBorder1.Controls.Add(this.pa_code_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);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(12, 12);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(442, 157);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(589, 196);
             this.groupBoxWithBorder1.TabIndex = 173;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "原箱信息";
@@ -278,11 +291,13 @@
             // 
             this.ms_outboxcode.AllPower = null;
             this.ms_outboxcode.BackColor = System.Drawing.Color.White;
+            this.ms_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ms_outboxcode.ID = null;
-            this.ms_outboxcode.Location = new System.Drawing.Point(72, 38);
+            this.ms_outboxcode.Location = new System.Drawing.Point(96, 48);
+            this.ms_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_outboxcode.Name = "ms_outboxcode";
             this.ms_outboxcode.Power = null;
-            this.ms_outboxcode.Size = new System.Drawing.Size(110, 29);
+            this.ms_outboxcode.Size = new System.Drawing.Size(145, 27);
             this.ms_outboxcode.Str = null;
             this.ms_outboxcode.Str1 = null;
             this.ms_outboxcode.Str2 = null;
@@ -293,10 +308,11 @@
             // 
             this.pa_packtype.AutoSize = true;
             this.pa_packtype.CutLength = null;
-            this.pa_packtype.Location = new System.Drawing.Point(113, 9);
-            this.pa_packtype.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_packtype.Location = new System.Drawing.Point(149, 10);
+            this.pa_packtype.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_packtype.MaximumSize = new System.Drawing.Size(267, 0);
             this.pa_packtype.Name = "pa_packtype";
-            this.pa_packtype.Size = new System.Drawing.Size(0, 21);
+            this.pa_packtype.Size = new System.Drawing.Size(0, 27);
             this.pa_packtype.TabIndex = 181;
             this.pa_packtype.Visible = false;
             // 
@@ -304,10 +320,11 @@
             // 
             this.pa_type.AutoSize = true;
             this.pa_type.CutLength = null;
-            this.pa_type.Location = new System.Drawing.Point(401, 15);
-            this.pa_type.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_type.Location = new System.Drawing.Point(533, 18);
+            this.pa_type.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_type.MaximumSize = new System.Drawing.Size(267, 0);
             this.pa_type.Name = "pa_type";
-            this.pa_type.Size = new System.Drawing.Size(0, 21);
+            this.pa_type.Size = new System.Drawing.Size(0, 27);
             this.pa_type.TabIndex = 180;
             this.pa_type.Visible = false;
             // 
@@ -315,10 +332,11 @@
             // 
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
-            this.pa_custcode.Location = new System.Drawing.Point(357, 17);
-            this.pa_custcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_custcode.Location = new System.Drawing.Point(492, 20);
+            this.pa_custcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_custcode.MaximumSize = new System.Drawing.Size(267, 0);
             this.pa_custcode.Name = "pa_custcode";
-            this.pa_custcode.Size = new System.Drawing.Size(0, 21);
+            this.pa_custcode.Size = new System.Drawing.Size(0, 27);
             this.pa_custcode.TabIndex = 179;
             this.pa_custcode.Visible = false;
             // 
@@ -326,10 +344,11 @@
             // 
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.CutLength = null;
-            this.pa_salecode.Location = new System.Drawing.Point(282, 9);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(375, 10);
+            this.pa_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(267, 0);
             this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 21);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 27);
             this.pa_salecode.TabIndex = 178;
             this.pa_salecode.Visible = false;
             // 
@@ -337,10 +356,11 @@
             // 
             this.pa_level.AutoSize = true;
             this.pa_level.CutLength = null;
-            this.pa_level.Location = new System.Drawing.Point(105, 9);
-            this.pa_level.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_level.Location = new System.Drawing.Point(139, 10);
+            this.pa_level.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_level.MaximumSize = new System.Drawing.Size(267, 0);
             this.pa_level.Name = "pa_level";
-            this.pa_level.Size = new System.Drawing.Size(0, 21);
+            this.pa_level.Size = new System.Drawing.Size(0, 27);
             this.pa_level.TabIndex = 177;
             this.pa_level.Visible = false;
             // 
@@ -348,59 +368,65 @@
             // 
             this.lastsccode.AutoSize = true;
             this.lastsccode.CutLength = null;
-            this.lastsccode.Location = new System.Drawing.Point(323, 113);
-            this.lastsccode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.lastsccode.Location = new System.Drawing.Point(446, 140);
+            this.lastsccode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lastsccode.MaximumSize = new System.Drawing.Size(267, 0);
             this.lastsccode.Name = "lastsccode";
-            this.lastsccode.Size = new System.Drawing.Size(0, 21);
+            this.lastsccode.Size = new System.Drawing.Size(0, 27);
             this.lastsccode.TabIndex = 176;
             // 
             // ms_msmakecode
             // 
             this.ms_msmakecode.AutoSize = true;
             this.ms_msmakecode.CutLength = null;
-            this.ms_msmakecode.Location = new System.Drawing.Point(323, 77);
-            this.ms_msmakecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ms_msmakecode.Location = new System.Drawing.Point(446, 95);
+            this.ms_msmakecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_msmakecode.MaximumSize = new System.Drawing.Size(267, 0);
             this.ms_msmakecode.Name = "ms_msmakecode";
-            this.ms_msmakecode.Size = new System.Drawing.Size(0, 21);
+            this.ms_msmakecode.Size = new System.Drawing.Size(0, 27);
             this.ms_msmakecode.TabIndex = 175;
             // 
             // laststepcode
             // 
             this.laststepcode.AutoSize = true;
             this.laststepcode.CutLength = null;
-            this.laststepcode.Location = new System.Drawing.Point(108, 113);
-            this.laststepcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.laststepcode.Location = new System.Drawing.Point(161, 140);
+            this.laststepcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.laststepcode.MaximumSize = new System.Drawing.Size(267, 0);
             this.laststepcode.Name = "laststepcode";
-            this.laststepcode.Size = new System.Drawing.Size(0, 21);
+            this.laststepcode.Size = new System.Drawing.Size(0, 27);
             this.laststepcode.TabIndex = 174;
             // 
             // ms_prodcode
             // 
             this.ms_prodcode.AutoSize = true;
             this.ms_prodcode.CutLength = null;
-            this.ms_prodcode.Location = new System.Drawing.Point(108, 77);
-            this.ms_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ms_prodcode.Location = new System.Drawing.Point(161, 95);
+            this.ms_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_prodcode.MaximumSize = new System.Drawing.Size(267, 0);
             this.ms_prodcode.Name = "ms_prodcode";
-            this.ms_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ms_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ms_prodcode.TabIndex = 173;
             // 
             // pa_qty
             // 
             this.pa_qty.AutoSize = true;
             this.pa_qty.CutLength = null;
-            this.pa_qty.Location = new System.Drawing.Point(323, 38);
-            this.pa_qty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_qty.Location = new System.Drawing.Point(446, 46);
+            this.pa_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_qty.MaximumSize = new System.Drawing.Size(267, 0);
             this.pa_qty.Name = "pa_qty";
-            this.pa_qty.Size = new System.Drawing.Size(0, 21);
+            this.pa_qty.Size = new System.Drawing.Size(0, 27);
             this.pa_qty.TabIndex = 172;
             // 
             // label1
             // 
             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(211, 37);
+            this.label1.Location = new System.Drawing.Point(297, 45);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 171;
             this.label1.Text = "箱内数量";
             // 
@@ -408,9 +434,10 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(211, 113);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(297, 140);
+            this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
-            this.pa_currentqty_label.Size = new System.Drawing.Size(106, 21);
+            this.pa_currentqty_label.Size = new System.Drawing.Size(132, 27);
             this.pa_currentqty_label.TabIndex = 95;
             this.pa_currentqty_label.Text = "最后所在资源";
             // 
@@ -418,9 +445,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(211, 77);
+            this.pr_detail_label.Location = new System.Drawing.Point(297, 95);
+            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(81, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(101, 27);
             this.pr_detail_label.TabIndex = 80;
             this.pr_detail_label.Text = "工单/合同";
             // 
@@ -428,9 +456,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(2, 77);
+            this.pr_code_label.Location = new System.Drawing.Point(13, 95);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 81;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -438,9 +467,10 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(2, 113);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(13, 140);
+            this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
-            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(106, 21);
+            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(132, 27);
             this.pr_outboxinnerqty_label.TabIndex = 97;
             this.pr_outboxinnerqty_label.Text = "最后所在工序";
             // 
@@ -448,17 +478,18 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(2, 38);
+            this.pa_code_label.Location = new System.Drawing.Point(13, 46);
+            this.pa_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_code_label.Name = "pa_code_label";
-            this.pa_code_label.Size = new System.Drawing.Size(58, 21);
+            this.pa_code_label.Size = new System.Drawing.Size(72, 27);
             this.pa_code_label.TabIndex = 113;
             this.pa_code_label.Text = "原箱号";
             // 
             // Packing_CartonTransfer
             // 
-            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(910, 502);
+            this.ClientSize = new System.Drawing.Size(1213, 628);
             this.Controls.Add(this.清除);
             this.Controls.Add(this.sn_code);
             this.Controls.Add(this.sn_code_label);
@@ -466,7 +497,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);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Packing_CartonTransfer";
             this.Tag = "Packing!CartonTransfer";
             this.Text = "卡通箱转移";