Revert " 解决冲突与错误"

This reverts commit cde9af7dd094c1c49b18a4181e988ff32fdad80b.

.gitignore

@@ -211,4 +211,3 @@ GeneratedArtifacts/
 _Pvt_Extensions/
 ModelManifest.xml
 *.rar
-/MES接口/MES接口.csproj

UAS-MES/CustomControl/CustomTabControl/ThemedColors.cs

@@ -49,7 +49,7 @@ namespace UAS_MES
         }
         #endregion
         private static int GetCurrentThemeIndex()
-        { 
+        {
             int theme = (int)ColorScheme.NoTheme;
             if (VisualStyleInformation.IsSupportedByOS && VisualStyleInformation.IsEnabledByUser && Application.RenderWithVisualStyles)
             {

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeTextBox.cs

@@ -95,10 +95,5 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                     BaseUtil.ShowError("工单号不能为空");
             }
         }
-
-        public static implicit operator MaCodeTextBox(EnterTextBox v)
-        {
-            throw new NotImplementedException();
-        }
     }
 }

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.Designer.cs

@@ -56,11 +56,11 @@
             this.TextBox.Location = new System.Drawing.Point(0, 0);
             this.TextBox.Name = "TextBox";
             this.TextBox.Power = null;
- 
+<<<<<<< HEAD
             this.TextBox.Size = new System.Drawing.Size(247, 28);
- 
+=======
             this.TextBox.Size = new System.Drawing.Size(178, 21);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.TextBox.Str = null;
             this.TextBox.Str1 = null;
             this.TextBox.Str2 = null;

UAS-MES/CustomControl/TextBoxWithIcon/TextBoxGeneratePaCode.Designer.cs

@@ -29,10 +29,10 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
- 
- 
+<<<<<<< HEAD
+=======
             this.enterTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.GeneratePaCode = new System.Windows.Forms.PictureBox();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.enterTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();

UAS-MES/DbFind.cs

@@ -200,9 +200,8 @@ namespace UAS_MES
                                 fmCollection[FormName].Controls[SetValueField[j]].Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
                         }
                     }
-                }
+                }   
                 fmCollection[FormName].Controls[MainField].Focus();
-            }
             catch (Exception exa)
             {
                 SuccessReturnData = false;

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

@@ -44,17 +44,17 @@
             // 
             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)));
- 
+<<<<<<< HEAD
             this.pr_code_label.Location = new System.Drawing.Point(28, 90);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.pr_code_label.Location = new System.Drawing.Point(25, 75);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pr_code_label.TabIndex = 0;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -62,17 +62,17 @@
             // 
             this.pa_packageqty_label.AutoSize = true;
             this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.pa_packageqty_label.Location = new System.Drawing.Point(28, 158);
             this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_packageqty_label.Name = "pa_packageqty_label";
             this.pa_packageqty_label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.pa_packageqty_label.Location = new System.Drawing.Point(25, 131);
             this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_packageqty_label.Name = "pa_packageqty_label";
             this.pa_packageqty_label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pa_packageqty_label.TabIndex = 1;
             this.pa_packageqty_label.Text = "箱内数量";
             // 
@@ -80,17 +80,17 @@
             // 
             this.pa_outboxcode_label.AutoSize = true;
             this.pa_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.pa_outboxcode_label.Location = new System.Drawing.Point(28, 226);
             this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
             this.pa_outboxcode_label.Size = new System.Drawing.Size(62, 31);
- 
+=======
             this.pa_outboxcode_label.Location = new System.Drawing.Point(25, 189);
             this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
             this.pa_outboxcode_label.Size = new System.Drawing.Size(52, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pa_outboxcode_label.TabIndex = 2;
             this.pa_outboxcode_label.Text = "箱号";
             // 
@@ -100,35 +100,35 @@
             this.title.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.title.ForeColor = System.Drawing.SystemColors.ButtonFace;
- 
+<<<<<<< HEAD
             this.title.Location = new System.Drawing.Point(10, 9);
             this.title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.title.Name = "title";
             this.title.Size = new System.Drawing.Size(0, 31);
- 
+=======
             this.title.Location = new System.Drawing.Point(9, 8);
             this.title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.title.Name = "title";
             this.title.Size = new System.Drawing.Size(0, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.title.TabIndex = 9;
             // 
             // pa_outboxcode
             // 
             this.pa_outboxcode.ErrorMsg = null;
- 
+<<<<<<< HEAD
             this.pa_outboxcode.Location = new System.Drawing.Point(142, 226);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(6);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Pr_id = null;
             this.pa_outboxcode.Size = new System.Drawing.Size(212, 32);
- 
+=======
             this.pa_outboxcode.Location = new System.Drawing.Point(128, 189);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Pr_id = null;
             this.pa_outboxcode.Size = new System.Drawing.Size(206, 26);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pa_outboxcode.TabIndex = 10;
             // 
             // headBar1
@@ -136,15 +136,15 @@
             this.headBar1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
             this.headBar1.Location = new System.Drawing.Point(0, 0);
- 
+<<<<<<< HEAD
             this.headBar1.Margin = new System.Windows.Forms.Padding(6);
             this.headBar1.Name = "headBar1";
             this.headBar1.Size = new System.Drawing.Size(448, 48);
- 
+=======
             this.headBar1.Margin = new System.Windows.Forms.Padding(5);
             this.headBar1.Name = "headBar1";
             this.headBar1.Size = new System.Drawing.Size(399, 40);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.headBar1.TabIndex = 7;
             // 
             // pa_packageqty
@@ -152,20 +152,20 @@
             this.pa_packageqty.AllPower = null;
             this.pa_packageqty.BackColor = System.Drawing.Color.White;
             this.pa_packageqty.ID = null;
- 
+<<<<<<< HEAD
             this.pa_packageqty.Location = new System.Drawing.Point(144, 158);
- 
+=======
             this.pa_packageqty.Location = new System.Drawing.Point(128, 131);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4);
             this.pa_packageqty.Name = "pa_packageqty";
             this.pa_packageqty.Negative = false;
             this.pa_packageqty.Power = null;
- 
+<<<<<<< HEAD
             this.pa_packageqty.Size = new System.Drawing.Size(264, 28);
- 
+=======
             this.pa_packageqty.Size = new System.Drawing.Size(206, 25);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pa_packageqty.Str = null;
             this.pa_packageqty.Str1 = null;
             this.pa_packageqty.Str2 = null;
@@ -178,21 +178,21 @@
             this.pr_code.Condition = null;
             this.pr_code.DBTitle = "产品编号查询";
             this.pr_code.FormName = null;
- 
+<<<<<<< HEAD
             this.pr_code.Location = new System.Drawing.Point(142, 90);
- 
+=======
             this.pr_code.Location = new System.Drawing.Point(128, 75);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pr_code.Margin = new System.Windows.Forms.Padding(4);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = "ifread";
             this.pr_code.SelectField = null;
             this.pr_code.SetValueField = null;
- 
+<<<<<<< HEAD
             this.pr_code.Size = new System.Drawing.Size(224, 32);
- 
+=======
             this.pr_code.Size = new System.Drawing.Size(206, 26);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pr_code.TabIndex = 4;
             this.pr_code.TableName = null;
             this.pr_code.TextBoxEnable = false;
@@ -205,21 +205,21 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = null;
             this.Confirm.IsShowBorder = true;
- 
+<<<<<<< HEAD
             this.Confirm.Location = new System.Drawing.Point(184, 284);
- 
+=======
             this.Confirm.Location = new System.Drawing.Point(164, 236);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             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")));
             this.Confirm.Power = null;
- 
+<<<<<<< HEAD
             this.Confirm.Size = new System.Drawing.Size(80, 34);
- 
+=======
             this.Confirm.Size = new System.Drawing.Size(71, 29);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Confirm.TabIndex = 3;
             this.Confirm.Tag = "Make!NewPallet";
             this.Confirm.Text = "确认";
@@ -228,15 +228,15 @@
             // 
             // Make_NewPallet
             // 
- 
+<<<<<<< HEAD
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(448, 336);
- 
+=======
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(399, 280);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Controls.Add(this.pa_outboxcode);
             this.Controls.Add(this.title);
             this.Controls.Add(this.headBar1);
@@ -247,11 +247,11 @@
             this.Controls.Add(this.pa_packageqty_label);
             this.Controls.Add(this.pr_code_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- 
+<<<<<<< HEAD
             this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- 
+=======
             this.Margin = new System.Windows.Forms.Padding(4);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Name = "Make_NewPallet";
             this.Tag = "ShowDialogWindow";
             this.Text = "新增栈板";

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

@@ -34,13 +34,18 @@
             this.bc_remark_label = new System.Windows.Forms.Label();
             this.ms_sncode_label = new System.Windows.Forms.Label();
             this.bc_groupcode_label = new System.Windows.Forms.Label();
+            this.mc_restqty_label = new System.Windows.Forms.Label();
+            this.mcd_inqty_label = new System.Windows.Forms.Label();
+            this.ma_qty_label = new System.Windows.Forms.Label();
+            this.ma_prodcode_label = new System.Windows.Forms.Label();
+            this.pr_detail_label = new System.Windows.Forms.Label();
+            this.ms_makecode_label = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.GoodProduct = new System.Windows.Forms.RadioButton();
             this.Reject = new System.Windows.Forms.RadioButton();
             this.WaitRejectList = new System.Windows.Forms.ListView();
             this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.label4 = new System.Windows.Forms.Label();
@@ -51,16 +56,9 @@
             this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.AutoBadCode = new System.Windows.Forms.CheckBox();
-            this.ma_qty_label = new System.Windows.Forms.Label();
-            this.ma_prodcode_label = new System.Windows.Forms.Label();
-            this.pr_detail_label = new System.Windows.Forms.Label();
-            this.ms_makecode_label = new System.Windows.Forms.Label();
-            this.mcd_inqty_label = new System.Windows.Forms.Label();
-            this.mc_restqty_label = new System.Windows.Forms.Label();
-            this.bc_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.LockMakeCode = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
+            this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ma_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -73,7 +71,8 @@
             this.bc_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.bc_groupcode = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.bc_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.AutoBadCode = new System.Windows.Forms.CheckBox();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -83,9 +82,15 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
+<<<<<<< HEAD
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(1401, 44);
+=======
             this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1230, 36);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.panel2.TabIndex = 30;
             // 
             // label1
@@ -93,21 +98,35 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+<<<<<<< HEAD
+            this.label1.Location = new System.Drawing.Point(18, 6);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(110, 31);
+=======
             this.label1.Location = new System.Drawing.Point(16, 5);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label1.TabIndex = 0;
-            this.label1.Text = "工单信息";
+            this.label1.Text = "基本信息";
             // 
             // bc_remark_label
             // 
             this.bc_remark_label.AutoSize = true;
             this.bc_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.bc_remark_label.Location = new System.Drawing.Point(30, 378);
+            this.bc_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.bc_remark_label.Name = "bc_remark_label";
+            this.bc_remark_label.Size = new System.Drawing.Size(110, 31);
+=======
             this.bc_remark_label.Location = new System.Drawing.Point(447, 214);
             this.bc_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_remark_label.Name = "bc_remark_label";
             this.bc_remark_label.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.bc_remark_label.TabIndex = 25;
             this.bc_remark_label.Text = "不良备注";
             // 
@@ -115,10 +134,17 @@
             // 
             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)));
+<<<<<<< HEAD
+            this.ms_sncode_label.Location = new System.Drawing.Point(346, 856);
+            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(86, 31);
+=======
             this.ms_sncode_label.Location = new System.Drawing.Point(308, 661);
             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);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ms_sncode_label.TabIndex = 18;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -126,33 +152,178 @@
             // 
             this.bc_groupcode_label.AutoSize = true;
             this.bc_groupcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.bc_groupcode_label.Location = new System.Drawing.Point(30, 316);
+            this.bc_groupcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.bc_groupcode_label.Name = "bc_groupcode_label";
+            this.bc_groupcode_label.Size = new System.Drawing.Size(110, 31);
+=======
             this.bc_groupcode_label.Location = new System.Drawing.Point(27, 211);
             this.bc_groupcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_groupcode_label.Name = "bc_groupcode_label";
             this.bc_groupcode_label.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.bc_groupcode_label.TabIndex = 24;
             this.bc_groupcode_label.Text = "不良组别";
             // 
+            // mc_restqty_label
+            // 
+            this.mc_restqty_label.AutoSize = true;
+            this.mc_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.mc_restqty_label.Location = new System.Drawing.Point(836, 152);
+            this.mc_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mc_restqty_label.Name = "mc_restqty_label";
+            this.mc_restqty_label.Size = new System.Drawing.Size(110, 31);
+=======
+            this.mc_restqty_label.Location = new System.Drawing.Point(785, 109);
+            this.mc_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mc_restqty_label.Name = "mc_restqty_label";
+            this.mc_restqty_label.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
+            this.mc_restqty_label.TabIndex = 17;
+            this.mc_restqty_label.Text = "待采集数";
+            // 
+            // mcd_inqty_label
+            // 
+            this.mcd_inqty_label.AutoSize = true;
+            this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.mcd_inqty_label.Location = new System.Drawing.Point(460, 152);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty_label.Name = "mcd_inqty_label";
+            this.mcd_inqty_label.Size = new System.Drawing.Size(110, 31);
+=======
+            this.mcd_inqty_label.Location = new System.Drawing.Point(451, 109);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty_label.Name = "mcd_inqty_label";
+            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
+            this.mcd_inqty_label.TabIndex = 14;
+            this.mcd_inqty_label.Text = "已采集数";
+            // 
+            // ma_qty_label
+            // 
+            this.ma_qty_label.AutoSize = true;
+            this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.ma_qty_label.Location = new System.Drawing.Point(36, 152);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty_label.Name = "ma_qty_label";
+            this.ma_qty_label.Size = new System.Drawing.Size(110, 31);
+=======
+            this.ma_qty_label.Location = new System.Drawing.Point(26, 109);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty_label.Name = "ma_qty_label";
+            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
+            this.ma_qty_label.TabIndex = 11;
+            this.ma_qty_label.Text = "工单数量";
+            // 
+            // ma_prodcode_label
+            // 
+            this.ma_prodcode_label.AutoSize = true;
+            this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.ma_prodcode_label.Location = new System.Drawing.Point(464, 76);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode_label.Name = "ma_prodcode_label";
+            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
+=======
+            this.ma_prodcode_label.Location = new System.Drawing.Point(454, 59);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode_label.Name = "ma_prodcode_label";
+            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
+            this.ma_prodcode_label.TabIndex = 7;
+            this.ma_prodcode_label.Text = "产品编号";
+            // 
+            // pr_detail_label
+            // 
+            this.pr_detail_label.AutoSize = true;
+            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.pr_detail_label.Location = new System.Drawing.Point(836, 81);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Name = "pr_detail_label";
+            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
+=======
+            this.pr_detail_label.Location = new System.Drawing.Point(785, 59);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Name = "pr_detail_label";
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
+            this.pr_detail_label.TabIndex = 6;
+            this.pr_detail_label.Text = "产品名称";
+            // 
+            // ms_makecode_label
+            // 
+            this.ms_makecode_label.AutoSize = true;
+            this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.ms_makecode_label.Location = new System.Drawing.Point(36, 76);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Name = "ms_makecode_label";
+            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.ms_makecode_label.TabIndex = 2;
+            this.ms_makecode_label.Text = "归属工单";
+            // 
+            // panel1
+            // 
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.panel1.Controls.Add(this.label2);
+            this.panel1.Location = new System.Drawing.Point(0, 232);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1401, 44);
+            this.panel1.TabIndex = 31;
+            // 
+=======
+            this.ms_makecode_label.Location = new System.Drawing.Point(26, 59);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Name = "ms_makecode_label";
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
+            this.ms_makecode_label.TabIndex = 2;
+            this.ms_makecode_label.Text = "归属工单";
+            // 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             // label2
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.label2.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.label2.Location = new System.Drawing.Point(18, 4);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(110, 31);
+=======
             this.label2.ForeColor = System.Drawing.Color.Blue;
             this.label2.Location = new System.Drawing.Point(26, 162);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label2.TabIndex = 0;
-            this.label2.Text = "采集信息";
+            this.label2.Text = "信息采集";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.label3.Location = new System.Drawing.Point(621, 321);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(110, 31);
+=======
             this.label3.Location = new System.Drawing.Point(27, 261);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label3.TabIndex = 34;
             this.label3.Text = "不良代码";
             // 
@@ -161,10 +332,17 @@
             this.GoodProduct.AutoSize = true;
             this.GoodProduct.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GoodProduct.ForeColor = System.Drawing.Color.Blue;
+<<<<<<< HEAD
+            this.GoodProduct.Location = new System.Drawing.Point(34, 849);
+            this.GoodProduct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.GoodProduct.Name = "GoodProduct";
+            this.GoodProduct.Size = new System.Drawing.Size(100, 42);
+=======
             this.GoodProduct.Location = new System.Drawing.Point(31, 655);
             this.GoodProduct.Margin = new System.Windows.Forms.Padding(4);
             this.GoodProduct.Name = "GoodProduct";
             this.GoodProduct.Size = new System.Drawing.Size(83, 35);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.GoodProduct.TabIndex = 35;
             this.GoodProduct.TabStop = true;
             this.GoodProduct.Text = "良品";
@@ -175,10 +353,17 @@
             this.Reject.AutoSize = true;
             this.Reject.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Reject.ForeColor = System.Drawing.Color.Red;
+<<<<<<< HEAD
+            this.Reject.Location = new System.Drawing.Point(159, 849);
+            this.Reject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Reject.Name = "Reject";
+            this.Reject.Size = new System.Drawing.Size(129, 42);
+=======
             this.Reject.Location = new System.Drawing.Point(141, 655);
             this.Reject.Margin = new System.Windows.Forms.Padding(4);
             this.Reject.Name = "Reject";
             this.Reject.Size = new System.Drawing.Size(107, 35);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Reject.TabIndex = 36;
             this.Reject.TabStop = true;
             this.Reject.Text = "不良品";
@@ -189,13 +374,19 @@
             this.WaitRejectList.CheckBoxes = true;
             this.WaitRejectList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader5,
-            this.columnHeader4,
             this.columnHeader1,
             this.columnHeader2});
+<<<<<<< HEAD
+            this.WaitRejectList.Location = new System.Drawing.Point(33, 540);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WaitRejectList.Name = "WaitRejectList";
+            this.WaitRejectList.Size = new System.Drawing.Size(442, 292);
+=======
             this.WaitRejectList.Location = new System.Drawing.Point(29, 337);
             this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.WaitRejectList.Name = "WaitRejectList";
             this.WaitRejectList.Size = new System.Drawing.Size(393, 304);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.WaitRejectList.TabIndex = 37;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
@@ -205,32 +396,32 @@
             this.columnHeader5.Text = " ";
             this.columnHeader5.Width = 20;
             // 
-            // columnHeader4
-            // 
-            this.columnHeader4.Text = "不良代码组";
-            this.columnHeader4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader4.Width = 100;
-            // 
             // columnHeader1
             // 
             this.columnHeader1.Text = "不良代码";
-            this.columnHeader1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.columnHeader1.Width = 80;
             // 
             // columnHeader2
             // 
             this.columnHeader2.Text = "备注";
             this.columnHeader2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader2.Width = 175;
+            this.columnHeader2.Width = 190;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.label4.Location = new System.Drawing.Point(36, 495);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(110, 31);
+=======
             this.label4.Location = new System.Drawing.Point(27, 306);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label4.TabIndex = 39;
             this.label4.Text = "待选不良";
             // 
@@ -238,10 +429,17 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+<<<<<<< HEAD
+            this.label5.Location = new System.Drawing.Point(615, 496);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(110, 31);
+=======
             this.label5.Location = new System.Drawing.Point(542, 306);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label5.TabIndex = 40;
             this.label5.Text = "已选不良";
             // 
@@ -249,10 +447,17 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(946, 180);
+<<<<<<< HEAD
+            this.label6.Location = new System.Drawing.Point(1071, 321);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(110, 31);
+=======
+            this.label6.Location = new System.Drawing.Point(946, 215);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(92, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label6.TabIndex = 46;
             this.label6.Text = "操作结果";
             // 
@@ -264,10 +469,17 @@
             this.columnHeader3,
             this.columnHeader7,
             this.columnHeader8});
+<<<<<<< HEAD
+            this.ChoosedRejectList.Location = new System.Drawing.Point(612, 540);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChoosedRejectList.Name = "ChoosedRejectList";
+            this.ChoosedRejectList.Size = new System.Drawing.Size(442, 292);
+=======
             this.ChoosedRejectList.Location = new System.Drawing.Point(544, 337);
             this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
             this.ChoosedRejectList.Size = new System.Drawing.Size(393, 304);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ChoosedRejectList.TabIndex = 50;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
@@ -293,102 +505,22 @@
             // 
             this.columnHeader8.Text = "备注";
             this.columnHeader8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader8.Width = 194;
-            // 
-            // AutoBadCode
-            // 
-            this.AutoBadCode.AutoSize = true;
-            this.AutoBadCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoBadCode.Location = new System.Drawing.Point(126, 309);
-            this.AutoBadCode.Name = "AutoBadCode";
-            this.AutoBadCode.Size = new System.Drawing.Size(151, 24);
-            this.AutoBadCode.TabIndex = 69;
-            this.AutoBadCode.Text = "自动产生不良代码";
-            this.AutoBadCode.UseVisualStyleBackColor = true;
-            // 
-            // ma_qty_label
-            // 
-            this.ma_qty_label.AutoSize = true;
-            this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(26, 109);
-            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
-            this.ma_qty_label.TabIndex = 11;
-            this.ma_qty_label.Text = "工单数量";
-            // 
-            // ma_prodcode_label
-            // 
-            this.ma_prodcode_label.AutoSize = true;
-            this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(438, 59);
-            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
-            this.ma_prodcode_label.TabIndex = 7;
-            this.ma_prodcode_label.Text = "产品编号";
-            // 
-            // pr_detail_label
-            // 
-            this.pr_detail_label.AutoSize = true;
-            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(792, 59);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
-            this.pr_detail_label.TabIndex = 6;
-            this.pr_detail_label.Text = "产品名称";
-            // 
-            // ms_makecode_label
-            // 
-            this.ms_makecode_label.AutoSize = true;
-            this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(26, 59);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
-            this.ms_makecode_label.TabIndex = 2;
-            this.ms_makecode_label.Text = "归属工单";
-            // 
-            // mcd_inqty_label
-            // 
-            this.mcd_inqty_label.AutoSize = true;
-            this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty_label.Location = new System.Drawing.Point(435, 109);
-            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mcd_inqty_label.Name = "mcd_inqty_label";
-            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
-            this.mcd_inqty_label.TabIndex = 14;
-            this.mcd_inqty_label.Text = "已采集数";
-            // 
-            // mc_restqty_label
-            // 
-            this.mc_restqty_label.AutoSize = true;
-            this.mc_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mc_restqty_label.Location = new System.Drawing.Point(792, 109);
-            this.mc_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mc_restqty_label.Name = "mc_restqty_label";
-            this.mc_restqty_label.Size = new System.Drawing.Size(92, 27);
-            this.mc_restqty_label.TabIndex = 17;
-            this.mc_restqty_label.Text = "待采集数";
-            // 
-            // bc_code
-            // 
-            this.bc_code.AllPower = null;
-            this.bc_code.BackColor = System.Drawing.Color.White;
-            this.bc_code.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_code.ID = null;
-            this.bc_code.Location = new System.Drawing.Point(159, 261);
-            this.bc_code.Margin = new System.Windows.Forms.Padding(4);
-            this.bc_code.Name = "bc_code";
-            this.bc_code.Power = null;
-            this.bc_code.Size = new System.Drawing.Size(251, 28);
-            this.bc_code.Str = null;
-            this.bc_code.Str1 = null;
-            this.bc_code.Str2 = null;
-            this.bc_code.TabIndex = 68;
-            this.bc_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bc_code_KeyDown);
-            // 
+            this.columnHeader8.Width = 100;
+            // 
+<<<<<<< HEAD
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(279, 507);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(208, 24);
+            this.label7.TabIndex = 51;
+            this.label7.Text = "（不勾选默认全部转移）";
+            // 
+=======
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             // ma_code
             // 
             this.ma_code.AllPower = null;
@@ -396,14 +528,23 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(143, 59);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+<<<<<<< HEAD
+            this.ma_code.Location = new System.Drawing.Point(196, 76);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+=======
+            this.ma_code.Location = new System.Drawing.Point(159, 59);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
+<<<<<<< HEAD
+            this.ma_code.Size = new System.Drawing.Size(231, 33);
+            this.ma_code.TabIndex = 64;
+=======
             this.ma_code.Size = new System.Drawing.Size(204, 25);
             this.ma_code.TabIndex = 67;
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
             this.ma_code.TextBoxEnable = true;
@@ -412,21 +553,47 @@
             // 
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.Location = new System.Drawing.Point(361, 62);
+            this.LockMakeCode.Location = new System.Drawing.Point(378, 62);
             this.LockMakeCode.Name = "LockMakeCode";
             this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
             this.LockMakeCode.TabIndex = 66;
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
             // 
+            // Save
+            // 
+            this.Save.AllPower = null;
+            this.Save.BackColor = System.Drawing.Color.Transparent;
+            this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
+            this.Save.Image = null;
+            this.Save.IsShowBorder = true;
+            this.Save.Location = new System.Drawing.Point(684, 659);
+            this.Save.Margin = new System.Windows.Forms.Padding(4);
+            this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
+            this.Save.Name = "Save";
+            this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
+            this.Save.Power = null;
+            this.Save.Size = new System.Drawing.Size(100, 30);
+            this.Save.TabIndex = 65;
+            this.Save.Text = "保存";
+            this.Save.UseVisualStyleBackColor = false;
+            this.Save.Click += new System.EventHandler(this.Save_Click);
+            // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(914, 109);
+<<<<<<< HEAD
+            this.mcd_remainqty.Location = new System.Drawing.Point(1020, 152);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.Name = "mcd_remainqty";
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 31);
+=======
+            this.mcd_remainqty.Location = new System.Drawing.Point(920, 109);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.mcd_remainqty.TabIndex = 57;
             this.mcd_remainqty.Tag = "mcd_remainqty";
             // 
@@ -434,30 +601,51 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(914, 59);
+<<<<<<< HEAD
+            this.pr_detail.Location = new System.Drawing.Point(1020, 81);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Size = new System.Drawing.Size(0, 31);
+=======
+            this.pr_detail.Location = new System.Drawing.Point(920, 59);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pr_detail.TabIndex = 56;
             // 
             // ma_qty
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(143, 109);
+<<<<<<< HEAD
+            this.ma_qty.Location = new System.Drawing.Point(196, 152);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(0, 31);
+=======
+            this.ma_qty.Location = new System.Drawing.Point(159, 109);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty.Name = "ma_qty";
             this.ma_qty.Size = new System.Drawing.Size(0, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ma_qty.TabIndex = 55;
             // 
             // mcd_inqty
             // 
             this.mcd_inqty.AutoSize = true;
             this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(567, 109);
+<<<<<<< HEAD
+            this.mcd_inqty.Location = new System.Drawing.Point(634, 152);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty.Name = "mcd_inqty";
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 31);
+=======
+            this.mcd_inqty.Location = new System.Drawing.Point(594, 109);
             this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty.Name = "mcd_inqty";
             this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.mcd_inqty.TabIndex = 54;
             this.mcd_inqty.Tag = "mcd_inqty";
             // 
@@ -465,19 +653,33 @@
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(567, 59);
+<<<<<<< HEAD
+            this.ma_prodcode.Location = new System.Drawing.Point(634, 76);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode.Name = "ma_prodcode";
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
+=======
+            this.ma_prodcode.Location = new System.Drawing.Point(594, 59);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ma_prodcode.TabIndex = 53;
             // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(951, 211);
+<<<<<<< HEAD
+            this.OperateResult.Location = new System.Drawing.Point(1077, 375);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(308, 457);
+=======
+            this.OperateResult.Location = new System.Drawing.Point(951, 259);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(275, 430);
+            this.OperateResult.Size = new System.Drawing.Size(275, 382);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.OperateResult.TabIndex = 52;
             this.OperateResult.Text = "";
             // 
@@ -488,13 +690,22 @@
             this.CleanInfo.DownImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.DownImage")));
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
+<<<<<<< HEAD
+            this.CleanInfo.Location = new System.Drawing.Point(1184, 850);
+            this.CleanInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+=======
             this.CleanInfo.Location = new System.Drawing.Point(1046, 656);
             this.CleanInfo.Margin = new System.Windows.Forms.Padding(4);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
             this.CleanInfo.NormalImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.NormalImage")));
             this.CleanInfo.Power = null;
+<<<<<<< HEAD
+            this.CleanInfo.Size = new System.Drawing.Size(92, 36);
+=======
             this.CleanInfo.Size = new System.Drawing.Size(81, 30);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.CleanInfo.TabIndex = 47;
             this.CleanInfo.Text = "清除内容";
             this.CleanInfo.UseVisualStyleBackColor = true;
@@ -503,10 +714,17 @@
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
+<<<<<<< HEAD
+            this.ChooseedReject.Location = new System.Drawing.Point(510, 718);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChooseedReject.Name = "ChooseedReject";
+            this.ChooseedReject.Size = new System.Drawing.Size(75, 34);
+=======
             this.ChooseedReject.Location = new System.Drawing.Point(452, 546);
             this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseedReject.Name = "ChooseedReject";
             this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ChooseedReject.TabIndex = 45;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
@@ -514,10 +732,17 @@
             // WaitReject
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
+<<<<<<< HEAD
+            this.WaitReject.Location = new System.Drawing.Point(510, 622);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WaitReject.Name = "WaitReject";
+            this.WaitReject.Size = new System.Drawing.Size(75, 34);
+=======
             this.WaitReject.Location = new System.Drawing.Point(452, 466);
             this.WaitReject.Margin = new System.Windows.Forms.Padding(4);
             this.WaitReject.Name = "WaitReject";
             this.WaitReject.Size = new System.Drawing.Size(67, 29);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.WaitReject.TabIndex = 44;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
@@ -527,25 +752,54 @@
             this.bc_remark.AllPower = null;
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.ID = null;
+<<<<<<< HEAD
+            this.bc_remark.Location = new System.Drawing.Point(184, 375);
+            this.bc_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bc_remark.Multiline = true;
+            this.bc_remark.Name = "bc_remark";
+            this.bc_remark.Power = null;
+            this.bc_remark.Size = new System.Drawing.Size(870, 97);
+=======
             this.bc_remark.Location = new System.Drawing.Point(547, 212);
             this.bc_remark.Margin = new System.Windows.Forms.Padding(4);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
             this.bc_remark.Size = new System.Drawing.Size(393, 77);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.bc_remark.Str = null;
             this.bc_remark.Str1 = null;
             this.bc_remark.Str2 = null;
             this.bc_remark.TabIndex = 41;
             // 
+<<<<<<< HEAD
+            // bc_code
+            // 
+            this.bc_code.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.bc_code.FormattingEnabled = true;
+            this.bc_code.Location = new System.Drawing.Point(770, 321);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bc_code.Name = "bc_code";
+            this.bc_code.Size = new System.Drawing.Size(284, 30);
+            this.bc_code.TabIndex = 33;
+            // 
+=======
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             // bc_groupcode
             // 
             this.bc_groupcode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_groupcode.FormattingEnabled = true;
+<<<<<<< HEAD
+            this.bc_groupcode.Location = new System.Drawing.Point(184, 321);
+            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bc_groupcode.Name = "bc_groupcode";
+            this.bc_groupcode.Size = new System.Drawing.Size(282, 30);
+=======
             this.bc_groupcode.Location = new System.Drawing.Point(159, 215);
             this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4);
             this.bc_groupcode.Name = "bc_groupcode";
             this.bc_groupcode.Size = new System.Drawing.Size(251, 26);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.bc_groupcode.TabIndex = 21;
             this.bc_groupcode.SelectedIndexChanged += new System.EventHandler(this.bc_groupcode_SelectedIndexChanged);
             // 
@@ -555,48 +809,91 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.ID = null;
+<<<<<<< HEAD
+            this.ms_sncode.Location = new System.Drawing.Point(476, 856);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ms_sncode.Name = "ms_sncode";
+            this.ms_sncode.Power = null;
+            this.ms_sncode.Size = new System.Drawing.Size(270, 32);
+=======
             this.ms_sncode.Location = new System.Drawing.Point(423, 661);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
             this.ms_sncode.Size = new System.Drawing.Size(240, 28);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
-            this.ms_sncode.TabIndex = 68;
+            this.ms_sncode.TabIndex = 19;
             this.ms_sncode.Tag = "IfWrite";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_code_KeyDown);
             // 
-            // Save
+            // bc_code
             // 
+<<<<<<< HEAD
             this.Save.AllPower = null;
             this.Save.BackColor = System.Drawing.Color.Transparent;
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.Image = null;
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(705, 656);
+            this.Save.Location = new System.Drawing.Point(770, 855);
+            this.Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.Power = null;
-            this.Save.Size = new System.Drawing.Size(87, 33);
-            this.Save.TabIndex = 70;
+            this.Save.Size = new System.Drawing.Size(112, 36);
+            this.Save.TabIndex = 65;
             this.Save.Text = "保存";
             this.Save.UseVisualStyleBackColor = false;
             this.Save.Click += new System.EventHandler(this.Save_Click);
             // 
             // Make_TestCollection
             // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.SystemColors.Control;
+            this.ClientSize = new System.Drawing.Size(1401, 936);
+            this.Controls.Add(this.Save);
+=======
+            this.bc_code.AllPower = null;
+            this.bc_code.BackColor = System.Drawing.Color.White;
+            this.bc_code.ID = null;
+            this.bc_code.Location = new System.Drawing.Point(159, 261);
+            this.bc_code.Name = "bc_code";
+            this.bc_code.Power = null;
+            this.bc_code.Size = new System.Drawing.Size(251, 25);
+            this.bc_code.Str = null;
+            this.bc_code.Str1 = null;
+            this.bc_code.Str2 = null;
+            this.bc_code.TabIndex = 68;
+            this.bc_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bc_code_KeyDown);
+            // 
+            // AutoBadCode
+            // 
+            this.AutoBadCode.AutoSize = true;
+            this.AutoBadCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.AutoBadCode.Location = new System.Drawing.Point(126, 309);
+            this.AutoBadCode.Name = "AutoBadCode";
+            this.AutoBadCode.Size = new System.Drawing.Size(151, 24);
+            this.AutoBadCode.TabIndex = 69;
+            this.AutoBadCode.Text = "自动产生不良代码";
+            this.AutoBadCode.UseVisualStyleBackColor = true;
+            // 
+            // Make_TestCollection
+            // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1230, 710);
-            this.Controls.Add(this.Save);
             this.Controls.Add(this.AutoBadCode);
             this.Controls.Add(this.bc_code);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.label2);
+            this.Controls.Add(this.Save);
             this.Controls.Add(this.mcd_remainqty);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.ma_qty);
@@ -629,7 +926,11 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.KeyPreview = true;
+<<<<<<< HEAD
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+=======
             this.Margin = new System.Windows.Forms.Padding(4);
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";
@@ -681,12 +982,11 @@
         private CustomControl.ValueLabel.ValueLabel ma_qty;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel mcd_remainqty;
+        private CustomControl.ButtonUtil.NormalButton Save;
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private CustomControl.TextBoxWithIcon.EnterTextBox bc_code;
         private System.Windows.Forms.CheckBox AutoBadCode;
-        private System.Windows.Forms.ColumnHeader columnHeader4;
-        private CustomControl.ButtonUtil.NormalButton Save;
     }
 }

UAS-MES/UAS-MES.csproj

@@ -78,7 +78,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
@@ -200,12 +200,6 @@
     <Compile Include="CustomControl\ComBoxWithFocus\SerialPortCombox.Designer.cs">
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControl\CustomCheckBox\LockCheckBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControl\CustomCheckBox\LockCheckBox.Designer.cs">
-      <DependentUpon>LockCheckBox.cs</DependentUpon>
-    </Compile>
     <Compile Include="CustomControl\CustomTabControl\CustomTabControl.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -255,12 +249,6 @@
     <Compile Include="CustomControl\Pagination\Pagination.Designer.cs">
       <DependentUpon>Pagination.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControl\Pagination\PaginationDbFind.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="CustomControl\Pagination\PaginationDbFind.Designer.cs">
-      <DependentUpon>PaginationDbFind.cs</DependentUpon>
-    </Compile>
     <Compile Include="CustomControl\ProcessBar\ProcessBar.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -291,18 +279,6 @@
     <Compile Include="CustomControl\TextBoxWithIcon\EnterTextBox.Designer.cs">
       <DependentUpon>EnterTextBox.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControl\TextBoxWithIcon\MaCodeSearchTextBox.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="CustomControl\TextBoxWithIcon\MaCodeSearchTextBox.Designer.cs">
-      <DependentUpon>MaCodeSearchTextBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="CustomControl\TextBoxWithIcon\MaCodeTextBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControl\TextBoxWithIcon\MaCodeTextBox.Designer.cs">
-      <DependentUpon>MaCodeTextBox.cs</DependentUpon>
-    </Compile>
     <Compile Include="CustomControl\TextBoxWithIcon\NumOnlyTextBox.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -381,12 +357,6 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_MendLabel.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Special\Special_MendLabel.Designer.cs">
-      <DependentUpon>Special_MendLabel.cs</DependentUpon>
-    </Compile>
     <Compile Include="Login.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -719,6 +689,10 @@
     <Compile Include="FunctionCode\Special\Special_MixPackage.Designer.cs">
       <DependentUpon>Special_MixPackage.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Special\Specail_MendLabel.cs" />
+    <Compile Include="FunctionCode\Special\Specail_MendLabel.Designer.cs">
+      <DependentUpon>Specail_MendLabel.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -745,7 +719,6 @@
     </Compile>
     <EmbeddedResource Include="CustomControl\AccordionMenu\AccordionMenu.resx">
       <DependentUpon>AccordionMenu.cs</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\ClickPicBox\ClickPicBox.resx">
       <DependentUpon>ClickPicBox.cs</DependentUpon>
@@ -756,9 +729,6 @@
     <EmbeddedResource Include="CustomControl\ComBoxWithFocus\SerialPortCombox.resx">
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControl\CustomCheckBox\LockCheckBox.resx">
-      <DependentUpon>LockCheckBox.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\CustomTabControl\CustomTabControl.resx">
       <DependentUpon>CustomTabControl.cs</DependentUpon>
     </EmbeddedResource>
@@ -774,9 +744,6 @@
     <EmbeddedResource Include="CustomControl\Pagination\Pagination.resx">
       <DependentUpon>Pagination.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControl\Pagination\PaginationDbFind.resx">
-      <DependentUpon>PaginationDbFind.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\ProcessBar\ProcessBar.resx">
       <DependentUpon>ProcessBar.cs</DependentUpon>
     </EmbeddedResource>
@@ -786,12 +753,6 @@
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\EnterTextBox.resx">
       <DependentUpon>EnterTextBox.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControl\TextBoxWithIcon\MaCodeSearchTextBox.resx">
-      <DependentUpon>MaCodeSearchTextBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CustomControl\TextBoxWithIcon\MaCodeTextBox.resx">
-      <DependentUpon>MaCodeTextBox.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\NumOnlyTextBox.resx">
       <DependentUpon>NumOnlyTextBox.cs</DependentUpon>
     </EmbeddedResource>
@@ -819,9 +780,6 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Special_MendLabel.resx">
-      <DependentUpon>Special_MendLabel.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Login.resx">
       <DependentUpon>Login.cs</DependentUpon>
     </EmbeddedResource>
@@ -974,6 +932,9 @@
     <EmbeddedResource Include="FunctionCode\Special\Special_MixPackage.resx">
       <DependentUpon>Special_MixPackage.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Special\Specail_MendLabel.resx">
+      <DependentUpon>Specail_MendLabel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.resx">
       <DependentUpon>SystemSetting_LabelMaintain.cs</DependentUpon>
     </EmbeddedResource>
@@ -1013,7 +974,6 @@
     <None Include="Resources\mailattachment.zip" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="UAS-MES.csproj.vspscc" />
     <None Include="Resources\timg.jpg" />
     <None Include="Resources\matte_white_square_icon_business_tool_hammer_128px_571061_easyicon.net.ico" />
     <None Include="Resources\Image1.bmp" />

UAS-出货标签管理/App.config

@@ -25,11 +25,11 @@
         <value />
       </setting>
       <setting name="FTPAddress" serializeAs="String">
- 
+<<<<<<< HEAD
         <value>ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8</value>
- 
+=======
         <value>ftp://richwellgroup.com.cn|printuser|printuser</value>
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
       </setting>
     </UAS_LabelMachine.Properties.Settings>
   </userSettings>

UAS-出货标签管理/Properties/Settings.Designer.cs

@@ -73,10 +73,11 @@ namespace UAS_LabelMachine.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- 
+<<<<<<< HEAD
         [global::System.Configuration.DefaultSettingValueAttribute("ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8")]
- 
+=======
         [global::System.Configuration.DefaultSettingValueAttribute("ftp://richwellgroup.com.cn|printuser|printuser")]
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
         public string FTPAddress {
             get {
                 return ((string)(this["FTPAddress"]));

UAS-出货标签管理/Properties/Settings.settings

@@ -15,11 +15,11 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="FTPAddress" Type="System.String" Scope="User">
- 
+<<<<<<< HEAD
       <Value Profile="(Default)">ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8</Value>
- 
+=======
       <Value Profile="(Default)">ftp://richwellgroup.com.cn|printuser|printuser</Value>
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
     </Setting>
   </Settings>
 </SettingsFile>

UAS-出货标签管理/客户标签维护.Designer.cs

@@ -33,13 +33,13 @@ namespace UAS_LabelMachine
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(客户标签维护));
- 
+<<<<<<< HEAD
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- 
+=======
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cl_code_label = new System.Windows.Forms.Label();
             this.cu_name_label = new System.Windows.Forms.Label();
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
@@ -61,10 +61,10 @@ namespace UAS_LabelMachine
             this.la_name = new System.Windows.Forms.TextBox();
             this.la_name_label = new System.Windows.Forms.Label();
             this.FTPShare = new System.Windows.Forms.CheckBox();
- 
- 
+<<<<<<< HEAD
+=======
             this.CodeSoft = new System.Windows.Forms.RadioButton();
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pagination1 = new UAS_LabelMachine.CustomControl.Pagination();
             this.NewLabel = new UAS_LabelMachine.CustomControl.NormalButton();
             this.NetURL = new UAS_LabelMachine.CustomControl.EnterTextBox();
@@ -99,17 +99,17 @@ namespace UAS_LabelMachine
             // 
             this.cl_code_label.AutoSize = true;
             this.cl_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.cl_code_label.Location = new System.Drawing.Point(46, 22);
             this.cl_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cl_code_label.Name = "cl_code_label";
             this.cl_code_label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.cl_code_label.Location = new System.Drawing.Point(41, 19);
             this.cl_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cl_code_label.Name = "cl_code_label";
             this.cl_code_label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cl_code_label.TabIndex = 145;
             this.cl_code_label.Text = "客户编号";
             // 
@@ -117,17 +117,17 @@ namespace UAS_LabelMachine
             // 
             this.cu_name_label.AutoSize = true;
             this.cu_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.cu_name_label.Location = new System.Drawing.Point(488, 24);
             this.cu_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cu_name_label.Name = "cu_name_label";
             this.cu_name_label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.cu_name_label.Location = new System.Drawing.Point(433, 20);
             this.cu_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cu_name_label.Name = "cu_name_label";
             this.cu_name_label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cu_name_label.TabIndex = 144;
             this.cu_name_label.Text = "客户名称";
             // 
@@ -135,7 +135,7 @@ namespace UAS_LabelMachine
             // 
             this.openFileDialog1.FileName = "openFileDialog1";
             // 
- 
+<<<<<<< HEAD
             // CodeSoft
             // 
             this.CodeSoft.AutoSize = true;
@@ -174,23 +174,23 @@ namespace UAS_LabelMachine
             this.labelSoft_label.TabIndex = 163;
             this.labelSoft_label.Text = "模板软件";
             // 
- 
- 
+=======
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.label1.Location = new System.Drawing.Point(1317, 165);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(158, 31);
- 
+=======
             this.label1.Location = new System.Drawing.Point(1225, 111);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(132, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label1.TabIndex = 164;
             this.label1.Text = "模板参数预览";
             // 
@@ -198,33 +198,33 @@ namespace UAS_LabelMachine
             // 
             this.PrinterList_lable.AutoSize = true;
             this.PrinterList_lable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.PrinterList_lable.Location = new System.Drawing.Point(1234, 74);
             this.PrinterList_lable.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrinterList_lable.Name = "PrinterList_lable";
             this.PrinterList_lable.Size = new System.Drawing.Size(134, 31);
- 
+=======
             this.PrinterList_lable.Location = new System.Drawing.Point(1227, 26);
             this.PrinterList_lable.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrinterList_lable.Name = "PrinterList_lable";
             this.PrinterList_lable.Size = new System.Drawing.Size(112, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.PrinterList_lable.TabIndex = 175;
             this.PrinterList_lable.Text = "打印机列表";
             // 
             // OpenFolder
             // 
- 
+<<<<<<< HEAD
             this.OpenFolder.Location = new System.Drawing.Point(847, 584);
             this.OpenFolder.Margin = new System.Windows.Forms.Padding(4);
             this.OpenFolder.Name = "OpenFolder";
             this.OpenFolder.Size = new System.Drawing.Size(112, 40);
- 
+=======
             this.OpenFolder.Location = new System.Drawing.Point(776, 612);
             this.OpenFolder.Margin = new System.Windows.Forms.Padding(4);
             this.OpenFolder.Name = "OpenFolder";
             this.OpenFolder.Size = new System.Drawing.Size(100, 34);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.OpenFolder.TabIndex = 156;
             this.OpenFolder.Text = "打开";
             this.OpenFolder.UseVisualStyleBackColor = true;
@@ -234,51 +234,51 @@ namespace UAS_LabelMachine
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.label3.Location = new System.Drawing.Point(454, 539);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.label3.Location = new System.Drawing.Point(403, 566);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label3.TabIndex = 171;
             this.label3.Text = "盘标类型";
             // 
             // FolderPath
             // 
             this.FolderPath.Enabled = false;
- 
+<<<<<<< HEAD
             this.FolderPath.Location = new System.Drawing.Point(572, 592);
             this.FolderPath.Margin = new System.Windows.Forms.Padding(4);
             this.FolderPath.Name = "FolderPath";
             this.FolderPath.Size = new System.Drawing.Size(240, 28);
- 
+=======
             this.FolderPath.Location = new System.Drawing.Point(531, 616);
             this.FolderPath.Margin = new System.Windows.Forms.Padding(4);
             this.FolderPath.Name = "FolderPath";
             this.FolderPath.Size = new System.Drawing.Size(213, 25);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.FolderPath.TabIndex = 157;
             // 
             // FolderPath_Label
             // 
             this.FolderPath_Label.AutoSize = true;
             this.FolderPath_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.FolderPath_Label.Location = new System.Drawing.Point(442, 589);
             this.FolderPath_Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.FolderPath_Label.Name = "FolderPath_Label";
             this.FolderPath_Label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.FolderPath_Label.Location = new System.Drawing.Point(403, 616);
             this.FolderPath_Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.FolderPath_Label.Name = "FolderPath_Label";
             this.FolderPath_Label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.FolderPath_Label.TabIndex = 158;
             this.FolderPath_Label.Text = "模板路径";
             // 
@@ -291,34 +291,34 @@ namespace UAS_LabelMachine
             "单盘",
             "中盒",
             "外箱"});
- 
+<<<<<<< HEAD
             this.la_type1.Location = new System.Drawing.Point(572, 545);
             this.la_type1.Margin = new System.Windows.Forms.Padding(4);
             this.la_type1.Name = "la_type1";
             this.la_type1.Size = new System.Drawing.Size(240, 26);
- 
+=======
             this.la_type1.Location = new System.Drawing.Point(531, 567);
             this.la_type1.Margin = new System.Windows.Forms.Padding(4);
             this.la_type1.Name = "la_type1";
             this.la_type1.Size = new System.Drawing.Size(213, 23);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_type1.TabIndex = 169;
             // 
             // cl_custcode_label
             // 
             this.cl_custcode_label.AutoSize = true;
             this.cl_custcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.cl_custcode_label.Location = new System.Drawing.Point(37, 540);
             this.cl_custcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cl_custcode_label.Name = "cl_custcode_label";
             this.cl_custcode_label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.cl_custcode_label.Location = new System.Drawing.Point(27, 562);
             this.cl_custcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cl_custcode_label.Name = "cl_custcode_label";
             this.cl_custcode_label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cl_custcode_label.TabIndex = 167;
             this.cl_custcode_label.Text = "客户编号";
             // 
@@ -332,51 +332,51 @@ namespace UAS_LabelMachine
             // 
             this.la_code_label.AutoSize = true;
             this.la_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.la_code_label.Location = new System.Drawing.Point(841, 540);
             this.la_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.la_code_label.Name = "la_code_label";
             this.la_code_label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.la_code_label.Location = new System.Drawing.Point(777, 566);
             this.la_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.la_code_label.Name = "la_code_label";
             this.la_code_label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_code_label.TabIndex = 178;
             this.la_code_label.Text = "模板编号";
             // 
             // LabelParam
             // 
             this.LabelParam.AutoScroll = true;
- 
+<<<<<<< HEAD
             this.LabelParam.Location = new System.Drawing.Point(1269, 200);
             this.LabelParam.Margin = new System.Windows.Forms.Padding(4);
             this.LabelParam.Name = "LabelParam";
             this.LabelParam.Size = new System.Drawing.Size(428, 318);
- 
+=======
             this.LabelParam.Location = new System.Drawing.Point(1230, 147);
             this.LabelParam.Margin = new System.Windows.Forms.Padding(4);
             this.LabelParam.Name = "LabelParam";
             this.LabelParam.Size = new System.Drawing.Size(328, 400);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.LabelParam.TabIndex = 180;
             // 
             // NetURL_label
             // 
             this.NetURL_label.AutoSize = true;
             this.NetURL_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.NetURL_label.Location = new System.Drawing.Point(1234, 113);
             this.NetURL_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.NetURL_label.Name = "NetURL_label";
             this.NetURL_label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.NetURL_label.Location = new System.Drawing.Point(1248, 61);
             this.NetURL_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.NetURL_label.Name = "NetURL_label";
             this.NetURL_label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.NetURL_label.TabIndex = 181;
             this.NetURL_label.Text = "网络路径";
             // 
@@ -384,17 +384,17 @@ namespace UAS_LabelMachine
             // 
             this.cl_labeltype_label.AutoSize = true;
             this.cl_labeltype_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.cl_labeltype_label.Location = new System.Drawing.Point(860, 24);
             this.cl_labeltype_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cl_labeltype_label.Name = "cl_labeltype_label";
             this.cl_labeltype_label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.cl_labeltype_label.Location = new System.Drawing.Point(812, 19);
             this.cl_labeltype_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cl_labeltype_label.Name = "cl_labeltype_label";
             this.cl_labeltype_label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cl_labeltype_label.TabIndex = 185;
             this.cl_labeltype_label.Text = "盘标类型";
             // 
@@ -403,17 +403,17 @@ namespace UAS_LabelMachine
             this.la_type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.la_type.DropDownWidth = 161;
             this.la_type.FormattingEnabled = true;
- 
+<<<<<<< HEAD
             this.la_type.Location = new System.Drawing.Point(980, 24);
             this.la_type.Margin = new System.Windows.Forms.Padding(4);
             this.la_type.Name = "la_type";
             this.la_type.Size = new System.Drawing.Size(240, 26);
- 
+=======
             this.la_type.Location = new System.Drawing.Point(940, 20);
             this.la_type.Margin = new System.Windows.Forms.Padding(4);
             this.la_type.Name = "la_type";
             this.la_type.Size = new System.Drawing.Size(213, 23);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_type.TabIndex = 184;
             this.la_type.Tag = "cl_labeltype";
             // 
@@ -421,34 +421,34 @@ namespace UAS_LabelMachine
             // 
             this.la_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
- 
+<<<<<<< HEAD
             this.la_name.Location = new System.Drawing.Point(164, 585);
             this.la_name.Margin = new System.Windows.Forms.Padding(4);
             this.la_name.Name = "la_name";
             this.la_name.Size = new System.Drawing.Size(221, 28);
- 
+=======
             this.la_name.Location = new System.Drawing.Point(155, 616);
             this.la_name.Margin = new System.Windows.Forms.Padding(4);
             this.la_name.Name = "la_name";
             this.la_name.Size = new System.Drawing.Size(0, 25);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_name.TabIndex = 186;
             // 
             // la_name_label
             // 
             this.la_name_label.AutoSize = true;
             this.la_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- 
+<<<<<<< HEAD
             this.la_name_label.Location = new System.Drawing.Point(37, 585);
             this.la_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.la_name_label.Name = "la_name_label";
             this.la_name_label.Size = new System.Drawing.Size(110, 31);
- 
+=======
             this.la_name_label.Location = new System.Drawing.Point(27, 616);
             this.la_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.la_name_label.Name = "la_name_label";
             this.la_name_label.Size = new System.Drawing.Size(92, 27);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_name_label.TabIndex = 187;
             this.la_name_label.Text = "模板名称";
             // 
@@ -457,23 +457,23 @@ namespace UAS_LabelMachine
             this.FTPShare.AutoSize = true;
             this.FTPShare.Checked = true;
             this.FTPShare.CheckState = System.Windows.Forms.CheckState.Checked;
- 
+<<<<<<< HEAD
             this.FTPShare.Location = new System.Drawing.Point(1002, 594);
             this.FTPShare.Margin = new System.Windows.Forms.Padding(4);
             this.FTPShare.Name = "FTPShare";
             this.FTPShare.Size = new System.Drawing.Size(97, 22);
- 
+=======
             this.FTPShare.Location = new System.Drawing.Point(905, 621);
             this.FTPShare.Margin = new System.Windows.Forms.Padding(4);
             this.FTPShare.Name = "FTPShare";
             this.FTPShare.Size = new System.Drawing.Size(83, 19);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.FTPShare.TabIndex = 188;
             this.FTPShare.Text = "FTP共享";
             this.FTPShare.UseVisualStyleBackColor = true;
             // 
- 
- 
+<<<<<<< HEAD
+=======
             // CodeSoft
             // 
             this.CodeSoft.AutoSize = true;
@@ -489,38 +489,38 @@ namespace UAS_LabelMachine
             this.CodeSoft.UseVisualStyleBackColor = true;
             this.CodeSoft.Visible = false;
             // 
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             // pagination1
             // 
             this.pagination1.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
             this.pagination1.Cursor = System.Windows.Forms.Cursors.Hand;
- 
+<<<<<<< HEAD
             this.pagination1.Location = new System.Drawing.Point(0, 667);
             this.pagination1.Margin = new System.Windows.Forms.Padding(6);
             this.pagination1.Name = "pagination1";
             this.pagination1.Size = new System.Drawing.Size(1733, 39);
- 
+=======
             this.pagination1.Location = new System.Drawing.Point(0, 683);
             this.pagination1.Margin = new System.Windows.Forms.Padding(5);
             this.pagination1.Name = "pagination1";
             this.pagination1.Size = new System.Drawing.Size(1572, 39);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pagination1.TabIndex = 190;
             // 
             // NewLabel
             // 
             this.NewLabel.Image = ((System.Drawing.Image)(resources.GetObject("NewLabel.Image")));
- 
+<<<<<<< HEAD
             this.NewLabel.Location = new System.Drawing.Point(1269, 573);
             this.NewLabel.Margin = new System.Windows.Forms.Padding(4);
             this.NewLabel.Name = "NewLabel";
             this.NewLabel.Size = new System.Drawing.Size(112, 44);
- 
+=======
             this.NewLabel.Location = new System.Drawing.Point(1128, 613);
             this.NewLabel.Margin = new System.Windows.Forms.Padding(4);
             this.NewLabel.Name = "NewLabel";
             this.NewLabel.Size = new System.Drawing.Size(81, 30);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.NewLabel.TabIndex = 189;
             this.NewLabel.Tag = "IfWrite";
             this.NewLabel.Text = "新增标签";
@@ -530,17 +530,17 @@ namespace UAS_LabelMachine
             // NetURL
             // 
             this.NetURL.ID = null;
- 
+<<<<<<< HEAD
             this.NetURL.Location = new System.Drawing.Point(1393, 116);
             this.NetURL.Margin = new System.Windows.Forms.Padding(4);
             this.NetURL.Name = "NetURL";
             this.NetURL.Size = new System.Drawing.Size(282, 28);
- 
+=======
             this.NetURL.Location = new System.Drawing.Point(1368, 61);
             this.NetURL.Margin = new System.Windows.Forms.Padding(4);
             this.NetURL.Name = "NetURL";
             this.NetURL.Size = new System.Drawing.Size(161, 25);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.NetURL.Str = null;
             this.NetURL.Str1 = null;
             this.NetURL.Str2 = null;
@@ -553,20 +553,20 @@ namespace UAS_LabelMachine
             this.la_code.Caller = null;
             this.la_code.Condition = null;
             this.la_code.FormName = null;
- 
+<<<<<<< HEAD
             this.la_code.Location = new System.Drawing.Point(977, 544);
- 
+=======
             this.la_code.Location = new System.Drawing.Point(905, 569);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_code.Margin = new System.Windows.Forms.Padding(4);
             this.la_code.Name = "la_code";
             this.la_code.SelectField = null;
             this.la_code.SetValueField = null;
- 
+<<<<<<< HEAD
             this.la_code.Size = new System.Drawing.Size(242, 32);
- 
+=======
             this.la_code.Size = new System.Drawing.Size(215, 26);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_code.TabIndex = 179;
             this.la_code.TableName = null;
             this.la_code.Tag = "la_code";
@@ -574,17 +574,17 @@ namespace UAS_LabelMachine
             // Save
             // 
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
- 
+<<<<<<< HEAD
             this.Save.Location = new System.Drawing.Point(1107, 584);
             this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.Name = "Save";
             this.Save.Size = new System.Drawing.Size(112, 44);
- 
+=======
             this.Save.Location = new System.Drawing.Point(1020, 613);
             this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.Name = "Save";
             this.Save.Size = new System.Drawing.Size(81, 30);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Save.TabIndex = 170;
             this.Save.Tag = "IfWrite";
             this.Save.Text = "保存";
@@ -593,34 +593,34 @@ namespace UAS_LabelMachine
             // 
             // ChooseAll
             // 
- 
+<<<<<<< HEAD
             this.ChooseAll.Location = new System.Drawing.Point(26, 146);
             this.ChooseAll.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.Size = new System.Drawing.Size(76, 34);
- 
+=======
             this.ChooseAll.Location = new System.Drawing.Point(23, 112);
             this.ChooseAll.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.Size = new System.Drawing.Size(45, 26);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ChooseAll.TabIndex = 177;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
             // 
             // PrinterList
             // 
- 
+<<<<<<< HEAD
             this.PrinterList.Location = new System.Drawing.Point(1393, 74);
             this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
             this.PrinterList.Name = "PrinterList";
             this.PrinterList.Size = new System.Drawing.Size(284, 30);
- 
+=======
             this.PrinterList.Location = new System.Drawing.Point(1368, 27);
             this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
             this.PrinterList.Name = "PrinterList";
             this.PrinterList.Size = new System.Drawing.Size(161, 25);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.PrinterList.TabIndex = 174;
             // 
             // LabelDataGridView
@@ -642,7 +642,7 @@ namespace UAS_LabelMachine
             this.cl_detno,
             this.cl_labelsoft,
             this.cl_status});
- 
+<<<<<<< HEAD
             this.LabelDataGridView.Location = new System.Drawing.Point(26, 123);
             this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(4);
             this.LabelDataGridView.Name = "LabelDataGridView";
@@ -659,7 +659,7 @@ namespace UAS_LabelMachine
             this.LabelDataGridView.RowTemplate.Height = 23;
             this.LabelDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.LabelDataGridView.Size = new System.Drawing.Size(1193, 395);
- 
+=======
             this.LabelDataGridView.Location = new System.Drawing.Point(23, 112);
             this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(4);
             this.LabelDataGridView.Name = "LabelDataGridView";
@@ -676,7 +676,7 @@ namespace UAS_LabelMachine
             this.LabelDataGridView.RowTemplate.Height = 23;
             this.LabelDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.LabelDataGridView.Size = new System.Drawing.Size(1186, 435);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.LabelDataGridView.TabIndex = 172;
             this.LabelDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellContentClick);
             this.LabelDataGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.LabelDataGridView_CellFormatting);
@@ -771,17 +771,17 @@ namespace UAS_LabelMachine
             // PrintTest
             // 
             this.PrintTest.Image = ((System.Drawing.Image)(resources.GetObject("PrintTest.Image")));
- 
+<<<<<<< HEAD
             this.PrintTest.Location = new System.Drawing.Point(1397, 573);
             this.PrintTest.Margin = new System.Windows.Forms.Padding(4);
             this.PrintTest.Name = "PrintTest";
             this.PrintTest.Size = new System.Drawing.Size(112, 44);
- 
+=======
             this.PrintTest.Location = new System.Drawing.Point(1354, 569);
             this.PrintTest.Margin = new System.Windows.Forms.Padding(4);
             this.PrintTest.Name = "PrintTest";
             this.PrintTest.Size = new System.Drawing.Size(81, 30);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.PrintTest.TabIndex = 166;
             this.PrintTest.Tag = "Print";
             this.PrintTest.Text = "打印测试";
@@ -793,20 +793,20 @@ namespace UAS_LabelMachine
             this.客户编号.Caller = null;
             this.客户编号.Condition = null;
             this.客户编号.FormName = null;
- 
+<<<<<<< HEAD
             this.客户编号.Location = new System.Drawing.Point(164, 539);
- 
+=======
             this.客户编号.Location = new System.Drawing.Point(155, 566);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.客户编号.Margin = new System.Windows.Forms.Padding(4);
             this.客户编号.Name = "客户编号";
             this.客户编号.SelectField = null;
             this.客户编号.SetValueField = null;
- 
+<<<<<<< HEAD
             this.客户编号.Size = new System.Drawing.Size(242, 32);
- 
+=======
             this.客户编号.Size = new System.Drawing.Size(181, 26);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.客户编号.TabIndex = 168;
             this.客户编号.TableName = null;
             this.客户编号.Tag = "cu_code";
@@ -816,20 +816,20 @@ namespace UAS_LabelMachine
             this.cu_code.Caller = null;
             this.cu_code.Condition = null;
             this.cu_code.FormName = null;
- 
+<<<<<<< HEAD
             this.cu_code.Location = new System.Drawing.Point(190, 24);
- 
+=======
             this.cu_code.Location = new System.Drawing.Point(169, 20);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cu_code.Margin = new System.Windows.Forms.Padding(4);
             this.cu_code.Name = "cu_code";
             this.cu_code.SelectField = null;
             this.cu_code.SetValueField = null;
- 
+<<<<<<< HEAD
             this.cu_code.Size = new System.Drawing.Size(225, 32);
- 
+=======
             this.cu_code.Size = new System.Drawing.Size(200, 26);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cu_code.TabIndex = 159;
             this.cu_code.TableName = null;
             this.cu_code.Tag = "cl_custcode";
@@ -837,17 +837,17 @@ namespace UAS_LabelMachine
             // UpdateGrid
             // 
             this.UpdateGrid.Image = ((System.Drawing.Image)(resources.GetObject("UpdateGrid.Image")));
- 
+<<<<<<< HEAD
             this.UpdateGrid.Location = new System.Drawing.Point(1044, 71);
             this.UpdateGrid.Margin = new System.Windows.Forms.Padding(4);
             this.UpdateGrid.Name = "UpdateGrid";
             this.UpdateGrid.Size = new System.Drawing.Size(112, 44);
- 
+=======
             this.UpdateGrid.Location = new System.Drawing.Point(927, 61);
             this.UpdateGrid.Margin = new System.Windows.Forms.Padding(4);
             this.UpdateGrid.Name = "UpdateGrid";
             this.UpdateGrid.Size = new System.Drawing.Size(81, 30);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.UpdateGrid.TabIndex = 154;
             this.UpdateGrid.Tag = "IfWrite";
             this.UpdateGrid.Text = "更新";
@@ -857,17 +857,17 @@ namespace UAS_LabelMachine
             // Screen
             // 
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
- 
+<<<<<<< HEAD
             this.Screen.Location = new System.Drawing.Point(866, 71);
             this.Screen.Margin = new System.Windows.Forms.Padding(4);
             this.Screen.Name = "Screen";
             this.Screen.Size = new System.Drawing.Size(112, 44);
- 
+=======
             this.Screen.Location = new System.Drawing.Point(776, 61);
             this.Screen.Margin = new System.Windows.Forms.Padding(4);
             this.Screen.Name = "Screen";
             this.Screen.Size = new System.Drawing.Size(81, 30);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Screen.TabIndex = 153;
             this.Screen.Tag = "IfRead";
             this.Screen.Text = "筛选";
@@ -877,17 +877,17 @@ namespace UAS_LabelMachine
             // cu_name
             // 
             this.cu_name.ID = null;
- 
+<<<<<<< HEAD
             this.cu_name.Location = new System.Drawing.Point(628, 24);
             this.cu_name.Margin = new System.Windows.Forms.Padding(4);
             this.cu_name.Name = "cu_name";
             this.cu_name.Size = new System.Drawing.Size(223, 28);
- 
+=======
             this.cu_name.Location = new System.Drawing.Point(559, 20);
             this.cu_name.Margin = new System.Windows.Forms.Padding(4);
             this.cu_name.Name = "cu_name";
             this.cu_name.Size = new System.Drawing.Size(199, 25);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cu_name.Str = null;
             this.cu_name.Str1 = null;
             this.cu_name.Str2 = null;
@@ -896,15 +896,15 @@ namespace UAS_LabelMachine
             // 
             // 客户标签维护
             // 
- 
+<<<<<<< HEAD
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1732, 706);
- 
+=======
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1572, 726);
- 
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Controls.Add(this.pagination1);
             this.Controls.Add(this.NewLabel);
             this.Controls.Add(this.FTPShare);
@@ -938,10 +938,10 @@ namespace UAS_LabelMachine
             this.Controls.Add(this.cu_name);
             this.Controls.Add(this.cl_code_label);
             this.Controls.Add(this.cu_name_label);
- 
+<<<<<<< HEAD
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
- 
- 
+=======
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "客户标签维护";
             this.Tag = "Make!CustLabel";

UAS-出货标签管理/客户标签维护.resx

@@ -223,10 +223,10 @@
         48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
 </value>
   </data>
- 
+<<<<<<< HEAD
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>78</value>
   </metadata>
- 
- 
+=======
+>>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
 </root>