Browse Source

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

Hcsy 7 years ago
parent
commit
192c3c9348

+ 5 - 5
UAS-MES/CustomControl/AccordionMenu/AccordionMenu.cs

@@ -130,7 +130,7 @@ namespace UAS_MES.CustomControl.AccordionMenu
             }
             }
             //根据模块的名称查询出所有的子模块
             //根据模块的名称查询出所有的子模块
             sql.Clear();
             sql.Clear();
-            sql.Append("select sn_displayname,sn_classname,sn_module,sn_modulecode,sn_using,sn_caller,sn_detno from CS$SYSNAVATION where sn_using=1 and sn_caller in(" + Callers.Substring(0, Callers.Length - 1) + ") order by sn_modulecode,sn_detno");
+            sql.Append("select sn_id,sn_displayname,sn_classname,sn_module,sn_modulecode,sn_using,sn_caller,sn_detno from CS$SYSNAVATION where sn_using=1 and sn_caller in(" + Callers.Substring(0, Callers.Length - 1) + ") order by sn_modulecode,sn_detno");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             sql.Clear();
             sql.Clear();
             //模块的数量,需要单独控制这个变量的增加
             //模块的数量,需要单独控制这个变量的增加
@@ -283,16 +283,16 @@ namespace UAS_MES.CustomControl.AccordionMenu
             //用Tag保存Caller
             //用Tag保存Caller
             OpenForm.Tag = item.ToolTipText;
             OpenForm.Tag = item.ToolTipText;
             TabControl tc = (TabControl)this.Parent.Parent.Controls["MainTabControl"];
             TabControl tc = (TabControl)this.Parent.Parent.Controls["MainTabControl"];
-            //如果窗体不存在进行打开
-            if (!OpenedFormName.ContainsKey("UAS_MES." + item.Text))
+            //如果窗体不存在进行打开,item.ToolTip是Caller
+            if (!OpenedFormName.ContainsKey(item.ToolTipText))
             {
             {
-                TabPage tb = new TabPage { Name = "UAS_MES." + item.Tag, Text = OpenForm.Text };
+                TabPage tb = new TabPage { Name = "UAS_MES." + item.Tag, Tag= item.ToolTipText, Text = OpenForm.Text };
                 OpenForm.TopLevel = false;
                 OpenForm.TopLevel = false;
                 tc.TabPages.Add(tb);
                 tc.TabPages.Add(tb);
                 //直接选中新打开的界面
                 //直接选中新打开的界面
                 tc.SelectedTab = tb;
                 tc.SelectedTab = tb;
                 tb.Controls.Add(OpenForm);
                 tb.Controls.Add(OpenForm);
-                OpenedFormName.Add("UAS_MES." + item.Text, WinIndex);
+                OpenedFormName.Add(item.ToolTipText, WinIndex);
                 tc.TabIndex = WinIndex;
                 tc.TabIndex = WinIndex;
                 WinIndex++;
                 WinIndex++;
                 OpenForm.WindowState = FormWindowState.Maximized;
                 OpenForm.WindowState = FormWindowState.Maximized;

+ 10 - 1
UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -209,6 +209,10 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             }
             }
         }
         }
         #endregion
         #endregion
+        //DBFind赋值后触发的委托
+        public delegate void AfterDBFind(object sender, EventArgs e);
+        //事件
+        public event AfterDBFind AfterDbFind;
 
 
         #region 自定义事件
         #region 自定义事件
         public delegate void OnTextChange(object sender, EventArgs e);
         public delegate void OnTextChange(object sender, EventArgs e);
@@ -235,7 +239,6 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             UserControlTextChanged?.Invoke(sender, new EventArgs());
             UserControlTextChanged?.Invoke(sender, new EventArgs());
         }
         }
 
 
-
         //Key先发起失去焦点事件,在执行用户自定义的事件
         //Key先发起失去焦点事件,在执行用户自定义的事件
         private void TextBox_KeyDown(object sender, KeyEventArgs e)
         private void TextBox_KeyDown(object sender, KeyEventArgs e)
         {
         {
@@ -245,6 +248,11 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             }
             }
         }
         }
 
 
+        public void AfterDBFindSetValue(object sender, EventArgs e)
+        {
+            AfterDbFind?.Invoke(sender, new EventArgs());
+        }
+
         public void SetLockCheckBox(CheckBox ctl)
         public void SetLockCheckBox(CheckBox ctl)
         {
         {
             LockCheckBox = ctl;
             LockCheckBox = ctl;
@@ -291,6 +299,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                     LeaveFindData = false;
                     LeaveFindData = false;
                 //不允许工单号为空的情况
                 //不允许工单号为空的情况
                 LockCheckBox.Checked = true;
                 LockCheckBox.Checked = true;
+                AfterDBFindSetValue(new object(),new EventArgs());
             }
             }
         }
         }
 
 

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

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

+ 2 - 5
UAS-MES/CustomControl/TextBoxWithIcon/TextBoxGeneratePaCode.Designer.cs

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

+ 22 - 3
UAS-MES/DbFind.cs

@@ -33,6 +33,8 @@ namespace UAS_MES
 
 
         string Condition = "";
         string Condition = "";
 
 
+        Control MainControl;
+
         public bool SuccessReturnData = false;
         public bool SuccessReturnData = false;
 
 
         int ScrollNewValue = 0;
         int ScrollNewValue = 0;
@@ -190,7 +192,6 @@ namespace UAS_MES
                 }
                 }
                 if (!groupcontains)
                 if (!groupcontains)
                 {
                 {
-
                     for (int i = 0; i < dt.Columns.Count; i++)
                     for (int i = 0; i < dt.Columns.Count; i++)
                     {
                     {
                         for (int j = 0; j < SetValueField.Length; j++)
                         for (int j = 0; j < SetValueField.Length; j++)
@@ -200,8 +201,18 @@ namespace UAS_MES
                                 fmCollection[FormName].Controls[SetValueField[j]].Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
                                 fmCollection[FormName].Controls[SetValueField[j]].Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
                         }
                         }
                     }
                     }
-                }   
-                fmCollection[FormName].Controls[MainField].Focus();
+                }
+                //发起DBFind的控件
+                MainControl = fmCollection[FormName].Controls[MainField];
+                MainControl.Focus();
+                if (MainControl is MaCodeSearchTextBox)
+                {
+                    MaCodeSearchTextBox ctl = (MainControl as MaCodeSearchTextBox);
+                    ctl.AfterDbFind += DbFind_AfterDbFind;
+                    ctl.AfterDBFindSetValue(new object(), new EventArgs());
+                }
+
+            }
             catch (Exception exa)
             catch (Exception exa)
             {
             {
                 SuccessReturnData = false;
                 SuccessReturnData = false;
@@ -209,6 +220,7 @@ namespace UAS_MES
             Dispose();
             Dispose();
             Close();
             Close();
         }
         }
+
         //按下Esc键的时候关闭当前的界面,用于DbFind
         //按下Esc键的时候关闭当前的界面,用于DbFind
         private void DbFindGridView_KeyPress(object sender, KeyPressEventArgs e)
         private void DbFindGridView_KeyPress(object sender, KeyPressEventArgs e)
         {
         {
@@ -219,6 +231,13 @@ namespace UAS_MES
             }
             }
         }
         }
 
 
+        private void DbFind_AfterDbFind(object sender, EventArgs e)
+        {
+            string MainControlText = MainControl.Text;
+            MainControl.Text = "";
+            MainControl.Text = MainControlText;
+        }
+
         //列宽发生变化的时候TextBox的宽度也发生变化
         //列宽发生变化的时候TextBox的宽度也发生变化
         private void DbFindGridView_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
         private void DbFindGridView_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
         {
         {

+ 8 - 8
UAS-MES/FunctionCode/Employee/Employee_Group.cs

@@ -98,12 +98,13 @@ namespace UAS_MES.Employee
         {
         {
             if (e.RowIndex >= 0 && e.ColumnIndex >= 0)
             if (e.RowIndex >= 0 && e.ColumnIndex >= 0)
             {
             {
-                if (UserGroupDGV.Columns[e.ColumnIndex].Name == "UserSetting")
+                string CallerUser = "Employee!Data";
+                string CallerPower = "Employee!Power";
+                if (UserGroupDGV.Columns[e.ColumnIndex].Name == "UserSetting" && !AccordionMenu.OpenedFormName.ContainsKey(CallerUser))
                 {
                 {
+                    AccordionMenu.OpenedFormName.Add(CallerUser, 101);
                     TabControl tc = (TabControl)this.Parent.Parent;
                     TabControl tc = (TabControl)this.Parent.Parent;
-                    //如果窗体不存在进行打开
-                    string WinPath = "UAS_MES.人员管理.人员选择";
-                    TabPage tb = new TabPage { Name = WinPath, Text = "人员查看" };
+                    TabPage tb = new TabPage { Name = CallerUser, Text = "人员查看" };
                     tc.TabPages.Add(tb);
                     tc.TabPages.Add(tb);
                     string ug_code = UserGroupDGV.Rows[e.RowIndex].Cells["ug_code"].Value.ToString();
                     string ug_code = UserGroupDGV.Rows[e.RowIndex].Cells["ug_code"].Value.ToString();
                     string ug_name = UserGroupDGV.Rows[e.RowIndex].Cells["ug_name"].Value.ToString();
                     string ug_name = UserGroupDGV.Rows[e.RowIndex].Cells["ug_name"].Value.ToString();
@@ -114,12 +115,12 @@ namespace UAS_MES.Employee
                     NewUser.WindowState = FormWindowState.Maximized;
                     NewUser.WindowState = FormWindowState.Maximized;
                     NewUser.Show();
                     NewUser.Show();
                 }
                 }
-                else if (UserGroupDGV.Columns[e.ColumnIndex].Name == "PowerSetting")
+                else if (UserGroupDGV.Columns[e.ColumnIndex].Name == "PowerSetting" && !AccordionMenu.OpenedFormName.ContainsKey(CallerPower))
                 {
                 {
+                    AccordionMenu.OpenedFormName.Add(CallerPower, 101);
                     TabControl tc = (TabControl)this.Parent.Parent;
                     TabControl tc = (TabControl)this.Parent.Parent;
                     //如果窗体不存在进行打开
                     //如果窗体不存在进行打开
-                    string WinPath = "UAS_MES.人员管理.权限控制";
-                    TabPage tb = new TabPage { Name = WinPath, Text = "权限控制" };
+                    TabPage tb = new TabPage { Name = CallerPower, Text = "权限控制" };
                     tc.TabPages.Add(tb);
                     tc.TabPages.Add(tb);
                     string ug_code = UserGroupDGV.Rows[e.RowIndex].Cells["ug_code"].Value.ToString();
                     string ug_code = UserGroupDGV.Rows[e.RowIndex].Cells["ug_code"].Value.ToString();
                     string ug_name = UserGroupDGV.Rows[e.RowIndex].Cells["ug_name"].Value.ToString();
                     string ug_name = UserGroupDGV.Rows[e.RowIndex].Cells["ug_name"].Value.ToString();
@@ -129,7 +130,6 @@ namespace UAS_MES.Employee
                     tb.Controls.Add(NewPower);
                     tb.Controls.Add(NewPower);
                     NewPower.WindowState = FormWindowState.Maximized;
                     NewPower.WindowState = FormWindowState.Maximized;
                     NewPower.Show();
                     NewPower.Show();
-                    AccordionMenu.OpenedFormName.Add(WinPath, 101);
                 }
                 }
             }
             }
         }
         }

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_FeedingCollection.Designer.cs

@@ -81,12 +81,12 @@
             this.label1.AutoSize = true;
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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;
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(16, 4);
+            this.label1.Location = new System.Drawing.Point(16, 5);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.TabIndex = 0;
-            this.label1.Text = "上料采集";
+            this.label1.Text = "工单信息";
             // 
             // 
             // mcd_restqty_label
             // mcd_restqty_label
             // 
             // 

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

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

+ 7 - 7
UAS-MES/FunctionCode/Make/Make_PackageCollection.Designer.cs

@@ -127,7 +127,7 @@
             this.label1.Name = "label1";
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.TabIndex = 0;
-            this.label1.Text = "基础信息";
+            this.label1.Text = "工单信息";
             // 
             // 
             // pa_packageqty_label
             // pa_packageqty_label
             // 
             // 
@@ -281,14 +281,14 @@
             // label2
             // label2
             // 
             // 
             this.label2.AutoSize = true;
             this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(27, 235);
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.ForeColor = System.Drawing.Color.Black;
+            this.label2.Location = new System.Drawing.Point(16, 237);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 162;
             this.label2.TabIndex = 162;
-            this.label2.Text = "装箱信息";
+            this.label2.Text = "采集信息";
             // 
             // 
             // pa_code
             // pa_code
             // 
             // 
@@ -509,12 +509,12 @@
             this.pd_innerqty,
             this.pd_innerqty,
             this.pa_indate,
             this.pa_indate,
             this.pd_id});
             this.pd_id});
-            this.PackageDetail.Location = new System.Drawing.Point(31, 268);
+            this.PackageDetail.Location = new System.Drawing.Point(21, 268);
             this.PackageDetail.Margin = new System.Windows.Forms.Padding(4);
             this.PackageDetail.Margin = new System.Windows.Forms.Padding(4);
             this.PackageDetail.Name = "PackageDetail";
             this.PackageDetail.Name = "PackageDetail";
             this.PackageDetail.ReadOnly = true;
             this.PackageDetail.ReadOnly = true;
             this.PackageDetail.RowTemplate.Height = 23;
             this.PackageDetail.RowTemplate.Height = 23;
-            this.PackageDetail.Size = new System.Drawing.Size(985, 430);
+            this.PackageDetail.Size = new System.Drawing.Size(995, 430);
             this.PackageDetail.TabIndex = 134;
             this.PackageDetail.TabIndex = 134;
             // 
             // 
             // pd_barcode
             // pd_barcode

+ 14 - 14
UAS-MES/FunctionCode/Make/Make_PositionStock.Designer.cs

@@ -69,7 +69,7 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1439, 36);
             this.panel2.Size = new System.Drawing.Size(1439, 36);
             this.panel2.TabIndex = 31;
             this.panel2.TabIndex = 31;
@@ -84,7 +84,7 @@
             this.label1.Name = "label1";
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.TabIndex = 0;
-            this.label1.Text = "岗位备料";
+            this.label1.Text = "工单信息";
             // 
             // 
             // sc_stepcode_label
             // sc_stepcode_label
             // 
             // 
@@ -168,14 +168,14 @@
             // label2
             // label2
             // 
             // 
             this.label2.AutoSize = true;
             this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(13, 165);
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.ForeColor = System.Drawing.Color.Black;
+            this.label2.Location = new System.Drawing.Point(16, 165);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(112, 27);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 181;
             this.label2.TabIndex = 181;
-            this.label2.Text = "批物料管控";
+            this.label2.Text = "采集信息";
             // 
             // 
             // ma_code
             // ma_code
             // 
             // 
@@ -205,7 +205,7 @@
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
             this.Clean.IsShowBorder = true;
             this.Clean.Location = new System.Drawing.Point(1237, 654);
             this.Clean.Location = new System.Drawing.Point(1237, 654);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
@@ -221,7 +221,7 @@
             // 
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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(1120, 198);
             this.OperateResult.Location = new System.Drawing.Point(1120, 198);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(311, 440);
             this.OperateResult.Size = new System.Drawing.Size(311, 440);
             this.OperateResult.TabIndex = 178;
             this.OperateResult.TabIndex = 178;
@@ -235,7 +235,7 @@
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
             this.Confirm.IsShowBorder = true;
             this.Confirm.Location = new System.Drawing.Point(461, 655);
             this.Confirm.Location = new System.Drawing.Point(461, 655);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
@@ -255,7 +255,7 @@
             this.pr_batchnum.BackColor = System.Drawing.Color.White;
             this.pr_batchnum.BackColor = System.Drawing.Color.White;
             this.pr_batchnum.ID = null;
             this.pr_batchnum.ID = null;
             this.pr_batchnum.Location = new System.Drawing.Point(117, 659);
             this.pr_batchnum.Location = new System.Drawing.Point(117, 659);
-            this.pr_batchnum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pr_batchnum.Margin = new System.Windows.Forms.Padding(4);
             this.pr_batchnum.Name = "pr_batchnum";
             this.pr_batchnum.Name = "pr_batchnum";
             this.pr_batchnum.Power = null;
             this.pr_batchnum.Power = null;
             this.pr_batchnum.Size = new System.Drawing.Size(320, 25);
             this.pr_batchnum.Size = new System.Drawing.Size(320, 25);
@@ -279,7 +279,7 @@
             this.Column7,
             this.Column7,
             this.Column8});
             this.Column8});
             this.BatchProduct.Location = new System.Drawing.Point(0, 198);
             this.BatchProduct.Location = new System.Drawing.Point(0, 198);
-            this.BatchProduct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.BatchProduct.Margin = new System.Windows.Forms.Padding(4);
             this.BatchProduct.Name = "BatchProduct";
             this.BatchProduct.Name = "BatchProduct";
             this.BatchProduct.RowTemplate.Height = 23;
             this.BatchProduct.RowTemplate.Height = 23;
             this.BatchProduct.Size = new System.Drawing.Size(1101, 441);
             this.BatchProduct.Size = new System.Drawing.Size(1101, 441);
@@ -393,7 +393,7 @@
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
             this.Screen.IsShowBorder = true;
             this.Screen.IsShowBorder = true;
             this.Screen.Location = new System.Drawing.Point(1351, 118);
             this.Screen.Location = new System.Drawing.Point(1351, 118);
-            this.Screen.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Screen.Margin = new System.Windows.Forms.Padding(4);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
             this.Screen.Name = "Screen";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
@@ -432,7 +432,7 @@
             this.Controls.Add(this.Screen);
             this.Controls.Add(this.Screen);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_PositionStock";
             this.Name = "Make_PositionStock";
             this.Tag = "Make!PositionStock";
             this.Tag = "Make!PositionStock";
             this.Text = "岗位备料";
             this.Text = "岗位备料";

+ 24 - 0
UAS-MES/FunctionCode/Make/Make_PositionStock.resx

@@ -404,6 +404,30 @@
   <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
     <value>True</value>
   </metadata>
   </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="Screen.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
   <data name="Screen.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

File diff suppressed because it is too large
+ 405 - 371
UAS-MES/FunctionCode/Make/Make_Repair.Designer.cs


+ 157 - 3
UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -4,6 +4,7 @@ using System.Data;
 using System.Drawing;
 using System.Drawing;
 using System.Text;
 using System.Text;
 using System.Windows.Forms;
 using System.Windows.Forms;
+using UAS_MES.CustomControl.DataGrid_View;
 using UAS_MES.DataOperate;
 using UAS_MES.DataOperate;
 using UAS_MES.Entity;
 using UAS_MES.Entity;
 using UAS_MES.PublicMethod;
 using UAS_MES.PublicMethod;
@@ -28,6 +29,14 @@ namespace UAS_MES.Make
         string insert_makeprocess = "insert into makeprocess(mp_id,mp_makecode,mp_maid, mp_mscode,mp_sncode,mp_stepcode,mp_stepname,mp_craftcode,mp_craftname,mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode) select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,mcd_stepcode,mcd_stepname,ma_craftcode,'','维修作业','#',sysdate,'" + User.UserName + "',ma_wccode,ma_linecode,'' from make left join makecraftdetail on mcd_macode=ma_code left join makeserial on ms_makecode=ma_code where ms_sncode=:ms_sncode and ma_code=:ma_code";
         string insert_makeprocess = "insert into makeprocess(mp_id,mp_makecode,mp_maid, mp_mscode,mp_sncode,mp_stepcode,mp_stepname,mp_craftcode,mp_craftname,mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode) select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,mcd_stepcode,mcd_stepname,ma_craftcode,'','维修作业','#',sysdate,'" + User.UserName + "',ma_wccode,ma_linecode,'' from make left join makecraftdetail on mcd_macode=ma_code left join makeserial on ms_makecode=ma_code where ms_sncode=:ms_sncode and ma_code=:ma_code";
         //是否获取过下拉框数据
         //是否获取过下拉框数据
         bool GetSelectData = false;
         bool GetSelectData = false;
+        /// <summary>
+        /// 存放父节点信息
+        /// </summary>
+        Dictionary<string, Dictionary<string, string>> BadInf_1 = new Dictionary<string, Dictionary<string, string>>();
+        /// <summary>
+        /// 存放子节点信息
+        /// </summary>
+        Dictionary<string, Dictionary<string, string>> BadInf_2 = new Dictionary<string, Dictionary<string, string>>();
 
 
         DataHelper dh = null;
         DataHelper dh = null;
 
 
@@ -39,6 +48,8 @@ namespace UAS_MES.Make
 
 
         AutoSizeFormClass asc = new AutoSizeFormClass();
         AutoSizeFormClass asc = new AutoSizeFormClass();
 
 
+        string macode;
+
         public Make_Repair()
         public Make_Repair()
         {
         {
             InitializeComponent();
             InitializeComponent();
@@ -57,14 +68,45 @@ namespace UAS_MES.Make
 
 
         private void 维修作业_Load(object sender, EventArgs e)
         private void 维修作业_Load(object sender, EventArgs e)
         {
         {
-            //添加不良信息的静态数据
+            dh = new DataHelper();
             asc.controllInitializeSize(this);
             asc.controllInitializeSize(this);
+            GetSNCode.Focus();
         }
         }
 
 
         private void GetSNCode_KeyDown(object sender, KeyEventArgs e)
         private void GetSNCode_KeyDown(object sender, KeyEventArgs e)
         {
         {
             if (e.KeyCode == Keys.Enter)
             if (e.KeyCode == Keys.Enter)
-            { }
+            {
+                if (GetSNCode.Text == "")
+                {
+                    MessageBox.Show("序列号不允许为空!");
+                    return;
+                }
+                string ErrorMessage = "";
+                //验证工序是否正确
+                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
+                {
+                    string macode = "";
+                    BadInf_1.Clear();
+                    if (LogicHandler.GetMakeInfo(GetSNCode.Text, out macode, out ErrorMessage))
+                    {
+                        //验证makeserial或者ms_firstsn表序列号是否存在
+                        sql.Clear();
+                        sql.Append("select max(ms_id) from makeserial where ms_makecode ='" + macode + "' and(ms_sncode");
+                        sql.Append("='" + GetSNCode.Text + "' or ms_firstsn in (select firstsn from makesnrelation ");
+                        sql.Append("where sn='" + GetSNCode.Text + "'))");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                            LoadBadInfTree();
+                        else
+                            OperatResult.AppendText(">>序列号" + GetSNCode.Text + "不存在\n", Color.Red);
+                    }
+                    else
+                        OperatResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                }
+                else
+                    OperatResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+            }
         }
         }
 
 
         private void Make_Repair_SizeChanged(object sender, EventArgs e)
         private void Make_Repair_SizeChanged(object sender, EventArgs e)
@@ -72,7 +114,119 @@ namespace UAS_MES.Make
             asc.controlAutoSize(this);
             asc.controlAutoSize(this);
         }
         }
 
 
-        private void BadCodeGrid_RowHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e)
+        private void BadCodeTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
+        {
+            if (e.Node.Level == 0)
+            {
+                string mb_id = e.Node.Tag.ToString();
+                bc_name.Text = BadInf_1[mb_id]["bc_name"];
+                bg_name.Text = BadInf_1[mb_id]["bg_name"];
+                mb_badremark.Text = BadInf_1[mb_id]["mb_badremark"];
+            }
+            if (e.Node.Level == 1)
+            {
+                string mbr_id = e.Node.Tag.ToString();
+                nrg_name.Text = BadInf_2[mbr_id]["nrg_name"];
+                nr_name.Text = BadInf_2[mbr_id]["nr_name"];
+                mbr_solutioncode.Text = BadInf_2[mbr_id]["mbr_solutioncode"];
+                mbr_dutycode.Text = BadInf_2[mbr_id]["mbr_dutycode"];
+                mbc_component.Text = dh.getFieldDataByCondition("makebadrscom", "mbc_component", "mbc_mbrid=" + mbr_id).ToString();
+                //加载两个Grid的数据源
+                ComponentSource.DataSource = (DataTable)dh.ExecuteSql("select mbp_part from makebadrspart where mbp_mbrid=" + mbr_id, "select");
+                LocationSource.DataSource = (DataTable)dh.ExecuteSql("select mbl_loc from makebadrsloc where mbl_mbrid=" + mbr_id, "select");
+                mbl_locdgv.DataSource = LocationSource;
+                mbp_partdgv.DataSource = ComponentSource;
+            }
+        }
+
+        private void LoadBadInfTree()
+        {
+
+            BadCodeTree.Nodes.Clear();
+            sql.Clear();
+            sql.Append("select mb_id,mb_sncode,mb_badcode,mb_bgcode,bc_name,bg_name,");
+            sql.Append("mb_badremark from makebad left join badcode on bc_code=mb_badcode left join badgroup ");
+            sql.Append("on bg_code=mb_bgcode where mb_sncode='" + GetSNCode.Text + "' and mb_makecode='" + macode + "'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            for (int i = 0; i < dt.Rows.Count; i++)
+            {
+                //添加根节点
+                TreeNode tnode_0 = new TreeNode();
+                tnode_0.Text = dt.Rows[i]["mb_bgcode"].ToString();
+                //作为Dictionary的主标识
+                string mb_id = dt.Rows[i]["mb_id"].ToString();
+                tnode_0.Tag = mb_id;
+                Dictionary<string, string> dic = new Dictionary<string, string>();
+                dic.Add("mb_id", mb_id);
+                dic.Add("mb_sncode", dt.Rows[i]["mb_sncode"].ToString());
+                dic.Add("mb_badcode", dt.Rows[i]["mb_badcode"].ToString());
+                dic.Add("mb_bgcode", dt.Rows[i]["mb_bgcode"].ToString());
+                dic.Add("bc_name", dt.Rows[i]["bc_name"].ToString());
+                dic.Add("bg_name", dt.Rows[i]["bg_name"].ToString());
+                dic.Add("mb_badremark", dt.Rows[i]["mb_badremark"].ToString());
+                BadInf_1.Add(tnode_0.Tag.ToString(), dic);
+                BadCodeTree.Nodes.Add(tnode_0);
+                //添加子节点
+                sql.Clear();
+                sql.Append("select mbr_id,mbr_brcode,mbr_brgcode,mbr_solutioncode,so_name,mbr_dutycode,nd_name,");
+                sql.Append("nrg_name,nr_name from makebadreason left join QUA_NGReason left join QUA_NGREASONGROUP on ");
+                sql.Append("nrg_code=nr_group on nr_code=mbr_brcode left join solution ");
+                sql.Append("on so_code=mbr_solutioncode left join ngduty on nd_code=mbr_dutycode where mbr_mbid=" + mb_id);
+                DataTable dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                for (int j = 0; j < dt1.Rows.Count; j++)
+                {
+                    TreeNode tnode_1 = new TreeNode();
+                    //存放子节点的信息
+                    Dictionary<string, string> dic1 = new Dictionary<string, string>();
+                    string mbr_id = dt1.Rows[j]["mbr_id"].ToString();
+                    tnode_1.Tag = mbr_id;
+                    dic1.Add("mbr_id", mbr_id);
+                    dic1.Add("mbr_brcode", dt1.Rows[j]["mbr_id"].ToString());
+                    dic1.Add("mbr_brgcode", dt1.Rows[j]["mbr_brcode"].ToString());
+                    dic1.Add("mbr_solutioncode", dt1.Rows[j]["mbr_solutioncode"].ToString());
+                    dic1.Add("mbr_dutycode", dt1.Rows[j]["mbr_dutycode"].ToString());
+                    dic1.Add("nd_name", dt1.Rows[j]["nd_name"].ToString());
+                    dic1.Add("so_name", dt1.Rows[j]["so_name"].ToString());
+                    dic1.Add("nrg_name", dt1.Rows[j]["nrg_name"].ToString());
+                    dic1.Add("nr_name", dt1.Rows[j]["nr_name"].ToString());
+                    tnode_1.Text = dt1.Rows[j]["mbr_brgcode"].ToString();
+                    BadInf_2.Add(mbr_id, dic1);
+                    tnode_0.Nodes.Add(tnode_1);
+                }
+            }
+        }
+
+        private void RefreshTreeView_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void RepairComplete_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void Scrap_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void NewBadCode_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void NewRepairInf_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void SaveRepairInf_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void DeleteRepairInf_Click(object sender, EventArgs e)
         {
         {
 
 
         }
         }

+ 21 - 0
UAS-MES/FunctionCode/Make/Make_Repair.resx

@@ -117,6 +117,24 @@
   <resheader name="writer">
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   </resheader>
+  <metadata name="LocationSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="ComponentSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>190, 17</value>
+  </metadata>
+  <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="NewRepairInf.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
   <data name="NewRepairInf.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
     <value>
@@ -1297,4 +1315,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
 </value>
   </data>
   </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>42</value>
+  </metadata>
 </root>
 </root>

+ 136 - 436
UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -34,18 +34,13 @@
             this.bc_remark_label = new System.Windows.Forms.Label();
             this.bc_remark_label = new System.Windows.Forms.Label();
             this.ms_sncode_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.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.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.GoodProduct = new System.Windows.Forms.RadioButton();
             this.GoodProduct = new System.Windows.Forms.RadioButton();
             this.Reject = new System.Windows.Forms.RadioButton();
             this.Reject = new System.Windows.Forms.RadioButton();
             this.WaitRejectList = new System.Windows.Forms.ListView();
             this.WaitRejectList = new System.Windows.Forms.ListView();
             this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             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.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader2 = ((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();
             this.label4 = new System.Windows.Forms.Label();
@@ -56,9 +51,16 @@
             this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader7 = ((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.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.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.LockMakeCode = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
             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.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ma_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ma_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -71,8 +73,7 @@
             this.bc_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.bc_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.bc_groupcode = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.bc_groupcode = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.bc_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.AutoBadCode = new System.Windows.Forms.CheckBox();
+            this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.panel2.SuspendLayout();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             this.SuspendLayout();
             // 
             // 
@@ -82,15 +83,9 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
             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.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1230, 36);
             this.panel2.Size = new System.Drawing.Size(1230, 36);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.panel2.TabIndex = 30;
             this.panel2.TabIndex = 30;
             // 
             // 
             // label1
             // label1
@@ -98,35 +93,21 @@
             this.label1.AutoSize = true;
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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;
             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.Location = new System.Drawing.Point(16, 5);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.Size = new System.Drawing.Size(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label1.TabIndex = 0;
             this.label1.TabIndex = 0;
-            this.label1.Text = "基本信息";
+            this.label1.Text = "工单信息";
             // 
             // 
             // bc_remark_label
             // bc_remark_label
             // 
             // 
             this.bc_remark_label.AutoSize = true;
             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)));
             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.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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_remark_label.Name = "bc_remark_label";
             this.bc_remark_label.Name = "bc_remark_label";
             this.bc_remark_label.Size = new System.Drawing.Size(92, 27);
             this.bc_remark_label.Size = new System.Drawing.Size(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.bc_remark_label.TabIndex = 25;
             this.bc_remark_label.TabIndex = 25;
             this.bc_remark_label.Text = "不良备注";
             this.bc_remark_label.Text = "不良备注";
             // 
             // 
@@ -134,17 +115,10 @@
             // 
             // 
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode_label.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.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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ms_sncode_label.TabIndex = 18;
             this.ms_sncode_label.TabIndex = 18;
             this.ms_sncode_label.Text = "序列号";
             this.ms_sncode_label.Text = "序列号";
             // 
             // 
@@ -152,178 +126,33 @@
             // 
             // 
             this.bc_groupcode_label.AutoSize = true;
             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)));
             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.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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_groupcode_label.Name = "bc_groupcode_label";
             this.bc_groupcode_label.Name = "bc_groupcode_label";
             this.bc_groupcode_label.Size = new System.Drawing.Size(92, 27);
             this.bc_groupcode_label.Size = new System.Drawing.Size(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.bc_groupcode_label.TabIndex = 24;
             this.bc_groupcode_label.TabIndex = 24;
             this.bc_groupcode_label.Text = "不良组别";
             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
             // label2
             // 
             // 
             this.label2.AutoSize = true;
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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.ForeColor = System.Drawing.Color.Blue;
             this.label2.Location = new System.Drawing.Point(26, 162);
             this.label2.Location = new System.Drawing.Point(26, 162);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.Size = new System.Drawing.Size(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label2.TabIndex = 0;
             this.label2.TabIndex = 0;
-            this.label2.Text = "信息采集";
+            this.label2.Text = "采集信息";
             // 
             // 
             // label3
             // label3
             // 
             // 
             this.label3.AutoSize = true;
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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.Location = new System.Drawing.Point(27, 261);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.Size = new System.Drawing.Size(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label3.TabIndex = 34;
             this.label3.TabIndex = 34;
             this.label3.Text = "不良代码";
             this.label3.Text = "不良代码";
             // 
             // 
@@ -332,17 +161,10 @@
             this.GoodProduct.AutoSize = true;
             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.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GoodProduct.ForeColor = System.Drawing.Color.Blue;
             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.Location = new System.Drawing.Point(31, 655);
             this.GoodProduct.Margin = new System.Windows.Forms.Padding(4);
             this.GoodProduct.Margin = new System.Windows.Forms.Padding(4);
             this.GoodProduct.Name = "GoodProduct";
             this.GoodProduct.Name = "GoodProduct";
             this.GoodProduct.Size = new System.Drawing.Size(83, 35);
             this.GoodProduct.Size = new System.Drawing.Size(83, 35);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.GoodProduct.TabIndex = 35;
             this.GoodProduct.TabIndex = 35;
             this.GoodProduct.TabStop = true;
             this.GoodProduct.TabStop = true;
             this.GoodProduct.Text = "良品";
             this.GoodProduct.Text = "良品";
@@ -353,17 +175,10 @@
             this.Reject.AutoSize = true;
             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.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Reject.ForeColor = System.Drawing.Color.Red;
             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.Location = new System.Drawing.Point(141, 655);
             this.Reject.Margin = new System.Windows.Forms.Padding(4);
             this.Reject.Margin = new System.Windows.Forms.Padding(4);
             this.Reject.Name = "Reject";
             this.Reject.Name = "Reject";
             this.Reject.Size = new System.Drawing.Size(107, 35);
             this.Reject.Size = new System.Drawing.Size(107, 35);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Reject.TabIndex = 36;
             this.Reject.TabIndex = 36;
             this.Reject.TabStop = true;
             this.Reject.TabStop = true;
             this.Reject.Text = "不良品";
             this.Reject.Text = "不良品";
@@ -374,19 +189,13 @@
             this.WaitRejectList.CheckBoxes = true;
             this.WaitRejectList.CheckBoxes = true;
             this.WaitRejectList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.WaitRejectList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader5,
             this.columnHeader5,
+            this.columnHeader4,
             this.columnHeader1,
             this.columnHeader1,
             this.columnHeader2});
             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.Location = new System.Drawing.Point(29, 337);
             this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.WaitRejectList.Name = "WaitRejectList";
             this.WaitRejectList.Name = "WaitRejectList";
             this.WaitRejectList.Size = new System.Drawing.Size(393, 304);
             this.WaitRejectList.Size = new System.Drawing.Size(393, 304);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.WaitRejectList.TabIndex = 37;
             this.WaitRejectList.TabIndex = 37;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
@@ -396,32 +205,32 @@
             this.columnHeader5.Text = " ";
             this.columnHeader5.Text = " ";
             this.columnHeader5.Width = 20;
             this.columnHeader5.Width = 20;
             // 
             // 
+            // columnHeader4
+            // 
+            this.columnHeader4.Text = "不良代码组";
+            this.columnHeader4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.columnHeader4.Width = 100;
+            // 
             // columnHeader1
             // columnHeader1
             // 
             // 
             this.columnHeader1.Text = "不良代码";
             this.columnHeader1.Text = "不良代码";
+            this.columnHeader1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.columnHeader1.Width = 80;
             this.columnHeader1.Width = 80;
             // 
             // 
             // columnHeader2
             // columnHeader2
             // 
             // 
             this.columnHeader2.Text = "备注";
             this.columnHeader2.Text = "备注";
             this.columnHeader2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.columnHeader2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader2.Width = 190;
+            this.columnHeader2.Width = 175;
             // 
             // 
             // label4
             // label4
             // 
             // 
             this.label4.AutoSize = true;
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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.Location = new System.Drawing.Point(27, 306);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.Size = new System.Drawing.Size(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label4.TabIndex = 39;
             this.label4.TabIndex = 39;
             this.label4.Text = "待选不良";
             this.label4.Text = "待选不良";
             // 
             // 
@@ -429,17 +238,10 @@
             // 
             // 
             this.label5.AutoSize = true;
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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.Location = new System.Drawing.Point(542, 306);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(92, 27);
             this.label5.Size = new System.Drawing.Size(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label5.TabIndex = 40;
             this.label5.TabIndex = 40;
             this.label5.Text = "已选不良";
             this.label5.Text = "已选不良";
             // 
             // 
@@ -447,17 +249,10 @@
             // 
             // 
             this.label6.AutoSize = true;
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-<<<<<<< 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.Location = new System.Drawing.Point(946, 180);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(92, 27);
             this.label6.Size = new System.Drawing.Size(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label6.TabIndex = 46;
             this.label6.TabIndex = 46;
             this.label6.Text = "操作结果";
             this.label6.Text = "操作结果";
             // 
             // 
@@ -469,17 +264,10 @@
             this.columnHeader3,
             this.columnHeader3,
             this.columnHeader7,
             this.columnHeader7,
             this.columnHeader8});
             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.Location = new System.Drawing.Point(544, 337);
             this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
             this.ChoosedRejectList.Name = "ChoosedRejectList";
             this.ChoosedRejectList.Size = new System.Drawing.Size(393, 304);
             this.ChoosedRejectList.Size = new System.Drawing.Size(393, 304);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ChoosedRejectList.TabIndex = 50;
             this.ChoosedRejectList.TabIndex = 50;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
@@ -505,22 +293,102 @@
             // 
             // 
             this.columnHeader8.Text = "备注";
             this.columnHeader8.Text = "备注";
             this.columnHeader8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.columnHeader8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            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
+            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);
+            // 
             // ma_code
             // ma_code
             // 
             // 
             this.ma_code.AllPower = null;
             this.ma_code.AllPower = null;
@@ -528,23 +396,14 @@
             this.ma_code.Condition = null;
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
             this.ma_code.FormName = null;
-<<<<<<< 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.Location = new System.Drawing.Point(143, 59);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = 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.Size = new System.Drawing.Size(204, 25);
             this.ma_code.TabIndex = 67;
             this.ma_code.TabIndex = 67;
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ma_code.TableName = null;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
             this.ma_code.Tag = "ma_code";
             this.ma_code.TextBoxEnable = true;
             this.ma_code.TextBoxEnable = true;
@@ -553,47 +412,21 @@
             // 
             // 
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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(378, 62);
+            this.LockMakeCode.Location = new System.Drawing.Point(361, 62);
             this.LockMakeCode.Name = "LockMakeCode";
             this.LockMakeCode.Name = "LockMakeCode";
             this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
             this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
             this.LockMakeCode.TabIndex = 66;
             this.LockMakeCode.TabIndex = 66;
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
             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
             // mcd_remainqty
             // 
             // 
             this.mcd_remainqty.AutoSize = true;
             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.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-<<<<<<< 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.Location = new System.Drawing.Point(914, 109);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.mcd_remainqty.TabIndex = 57;
             this.mcd_remainqty.TabIndex = 57;
             this.mcd_remainqty.Tag = "mcd_remainqty";
             this.mcd_remainqty.Tag = "mcd_remainqty";
             // 
             // 
@@ -601,51 +434,30 @@
             // 
             // 
             this.pr_detail.AutoSize = true;
             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.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-<<<<<<< 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.Location = new System.Drawing.Point(914, 59);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pr_detail.TabIndex = 56;
             this.pr_detail.TabIndex = 56;
             // 
             // 
             // ma_qty
             // ma_qty
             // 
             // 
             this.ma_qty.AutoSize = true;
             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.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-<<<<<<< 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.Location = new System.Drawing.Point(143, 109);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty.Name = "ma_qty";
             this.ma_qty.Name = "ma_qty";
             this.ma_qty.Size = new System.Drawing.Size(0, 27);
             this.ma_qty.Size = new System.Drawing.Size(0, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ma_qty.TabIndex = 55;
             this.ma_qty.TabIndex = 55;
             // 
             // 
             // mcd_inqty
             // mcd_inqty
             // 
             // 
             this.mcd_inqty.AutoSize = true;
             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.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-<<<<<<< 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.Location = new System.Drawing.Point(567, 109);
             this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty.Name = "mcd_inqty";
             this.mcd_inqty.Name = "mcd_inqty";
             this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.mcd_inqty.TabIndex = 54;
             this.mcd_inqty.TabIndex = 54;
             this.mcd_inqty.Tag = "mcd_inqty";
             this.mcd_inqty.Tag = "mcd_inqty";
             // 
             // 
@@ -653,33 +465,19 @@
             // 
             // 
             this.ma_prodcode.AutoSize = true;
             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.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-<<<<<<< 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.Location = new System.Drawing.Point(567, 59);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ma_prodcode.TabIndex = 53;
             this.ma_prodcode.TabIndex = 53;
             // 
             // 
             // OperateResult
             // OperateResult
             // 
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-<<<<<<< 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.Location = new System.Drawing.Point(951, 211);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(275, 382);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
+            this.OperateResult.Size = new System.Drawing.Size(275, 430);
             this.OperateResult.TabIndex = 52;
             this.OperateResult.TabIndex = 52;
             this.OperateResult.Text = "";
             this.OperateResult.Text = "";
             // 
             // 
@@ -690,22 +488,13 @@
             this.CleanInfo.DownImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.DownImage")));
             this.CleanInfo.DownImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.DownImage")));
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
             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.Location = new System.Drawing.Point(1046, 656);
             this.CleanInfo.Margin = new System.Windows.Forms.Padding(4);
             this.CleanInfo.Margin = new System.Windows.Forms.Padding(4);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
             this.CleanInfo.Name = "CleanInfo";
             this.CleanInfo.NormalImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.NormalImage")));
             this.CleanInfo.NormalImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.NormalImage")));
             this.CleanInfo.Power = null;
             this.CleanInfo.Power = null;
-<<<<<<< HEAD
-            this.CleanInfo.Size = new System.Drawing.Size(92, 36);
-=======
             this.CleanInfo.Size = new System.Drawing.Size(81, 30);
             this.CleanInfo.Size = new System.Drawing.Size(81, 30);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.CleanInfo.TabIndex = 47;
             this.CleanInfo.TabIndex = 47;
             this.CleanInfo.Text = "清除内容";
             this.CleanInfo.Text = "清除内容";
             this.CleanInfo.UseVisualStyleBackColor = true;
             this.CleanInfo.UseVisualStyleBackColor = true;
@@ -714,17 +503,10 @@
             // ChooseedReject
             // ChooseedReject
             // 
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
             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.Location = new System.Drawing.Point(452, 546);
             this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseedReject.Name = "ChooseedReject";
             this.ChooseedReject.Name = "ChooseedReject";
             this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
             this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ChooseedReject.TabIndex = 45;
             this.ChooseedReject.TabIndex = 45;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
@@ -732,17 +514,10 @@
             // WaitReject
             // WaitReject
             // 
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
             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.Location = new System.Drawing.Point(452, 466);
             this.WaitReject.Margin = new System.Windows.Forms.Padding(4);
             this.WaitReject.Margin = new System.Windows.Forms.Padding(4);
             this.WaitReject.Name = "WaitReject";
             this.WaitReject.Name = "WaitReject";
             this.WaitReject.Size = new System.Drawing.Size(67, 29);
             this.WaitReject.Size = new System.Drawing.Size(67, 29);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.WaitReject.TabIndex = 44;
             this.WaitReject.TabIndex = 44;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
@@ -752,54 +527,25 @@
             this.bc_remark.AllPower = null;
             this.bc_remark.AllPower = null;
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.ID = null;
             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.Location = new System.Drawing.Point(547, 212);
             this.bc_remark.Margin = new System.Windows.Forms.Padding(4);
             this.bc_remark.Margin = new System.Windows.Forms.Padding(4);
             this.bc_remark.Multiline = true;
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
             this.bc_remark.Power = null;
             this.bc_remark.Size = new System.Drawing.Size(393, 77);
             this.bc_remark.Size = new System.Drawing.Size(393, 77);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.bc_remark.Str = null;
             this.bc_remark.Str = null;
             this.bc_remark.Str1 = null;
             this.bc_remark.Str1 = null;
             this.bc_remark.Str2 = null;
             this.bc_remark.Str2 = null;
             this.bc_remark.TabIndex = 41;
             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
             // 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.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_groupcode.FormattingEnabled = true;
             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.Location = new System.Drawing.Point(159, 215);
             this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4);
             this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4);
             this.bc_groupcode.Name = "bc_groupcode";
             this.bc_groupcode.Name = "bc_groupcode";
             this.bc_groupcode.Size = new System.Drawing.Size(251, 26);
             this.bc_groupcode.Size = new System.Drawing.Size(251, 26);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.bc_groupcode.TabIndex = 21;
             this.bc_groupcode.TabIndex = 21;
             this.bc_groupcode.SelectedIndexChanged += new System.EventHandler(this.bc_groupcode_SelectedIndexChanged);
             this.bc_groupcode.SelectedIndexChanged += new System.EventHandler(this.bc_groupcode_SelectedIndexChanged);
             // 
             // 
@@ -809,91 +555,48 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             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.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.ID = null;
             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.Location = new System.Drawing.Point(423, 661);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
             this.ms_sncode.Power = null;
             this.ms_sncode.Size = new System.Drawing.Size(240, 28);
             this.ms_sncode.Size = new System.Drawing.Size(240, 28);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ms_sncode.Str = null;
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
             this.ms_sncode.Str2 = null;
-            this.ms_sncode.TabIndex = 19;
+            this.ms_sncode.TabIndex = 68;
             this.ms_sncode.Tag = "IfWrite";
             this.ms_sncode.Tag = "IfWrite";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_code_KeyDown);
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_code_KeyDown);
             // 
             // 
-            // bc_code
+            // Save
             // 
             // 
-<<<<<<< HEAD
             this.Save.AllPower = null;
             this.Save.AllPower = null;
             this.Save.BackColor = System.Drawing.Color.Transparent;
             this.Save.BackColor = System.Drawing.Color.Transparent;
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.Image = null;
             this.Save.Image = null;
             this.Save.IsShowBorder = true;
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(770, 855);
-            this.Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Save.Location = new System.Drawing.Point(705, 656);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.Power = null;
             this.Save.Power = null;
-            this.Save.Size = new System.Drawing.Size(112, 36);
-            this.Save.TabIndex = 65;
+            this.Save.Size = new System.Drawing.Size(87, 33);
+            this.Save.TabIndex = 70;
             this.Save.Text = "保存";
             this.Save.Text = "保存";
             this.Save.UseVisualStyleBackColor = false;
             this.Save.UseVisualStyleBackColor = false;
             this.Save.Click += new System.EventHandler(this.Save_Click);
             this.Save.Click += new System.EventHandler(this.Save_Click);
             // 
             // 
             // Make_TestCollection
             // 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.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1230, 710);
             this.ClientSize = new System.Drawing.Size(1230, 710);
+            this.Controls.Add(this.Save);
             this.Controls.Add(this.AutoBadCode);
             this.Controls.Add(this.AutoBadCode);
             this.Controls.Add(this.bc_code);
             this.Controls.Add(this.bc_code);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label2);
-            this.Controls.Add(this.Save);
             this.Controls.Add(this.mcd_remainqty);
             this.Controls.Add(this.mcd_remainqty);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.ma_qty);
             this.Controls.Add(this.ma_qty);
@@ -926,11 +629,7 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.KeyPreview = true;
             this.KeyPreview = true;
-<<<<<<< HEAD
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-=======
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Margin = new System.Windows.Forms.Padding(4);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Name = "Make_TestCollection";
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";
             this.Text = " ";
@@ -982,11 +681,12 @@
         private CustomControl.ValueLabel.ValueLabel ma_qty;
         private CustomControl.ValueLabel.ValueLabel ma_qty;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel mcd_remainqty;
         private CustomControl.ValueLabel.ValueLabel mcd_remainqty;
-        private CustomControl.ButtonUtil.NormalButton Save;
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private CustomControl.TextBoxWithIcon.EnterTextBox bc_code;
         private CustomControl.TextBoxWithIcon.EnterTextBox bc_code;
         private System.Windows.Forms.CheckBox AutoBadCode;
         private System.Windows.Forms.CheckBox AutoBadCode;
+        private System.Windows.Forms.ColumnHeader columnHeader4;
+        private CustomControl.ButtonUtil.NormalButton Save;
     }
     }
 }
 }

+ 12 - 9
UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -183,12 +183,12 @@ namespace UAS_MES.Make
         private void LoadBadCodeListView()
         private void LoadBadCodeListView()
         {
         {
             sql.Clear();
             sql.Clear();
-            sql.Append("select bc_code,bc_name from badcode left join badgroup on bc_groupcode=bg_code where bc_groupcode='" + bc_groupcode.Text + "'");
+            sql.Append("select bg_code,bc_name,bc_note from badcode left join badgroup on bc_groupcode=bg_code where bc_groupcode='" + bc_groupcode.Text + "' and bg_code is not null");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //如果未获取到不良代码则去除限制条件获取全部的
             //如果未获取到不良代码则去除限制条件获取全部的
             if (dt.Rows.Count == 0)
             if (dt.Rows.Count == 0)
             {
             {
-                dt = (DataTable)dh.ExecuteSql("select bc_code,bc_name  from badcode left join badgroup on bc_groupcode=bg_code", "select");
+                dt = (DataTable)dh.ExecuteSql("select bg_code,bc_name,bc_note from badcode left join badgroup on bc_groupcode=bg_code where bg_code is not null", "select");
             }
             }
             //往listview中添加数据
             //往listview中添加数据
             WaitRejectList.Items.Clear();
             WaitRejectList.Items.Clear();
@@ -231,7 +231,7 @@ namespace UAS_MES.Make
                 else
                 else
                 {
                 {
                     //良品信息采集
                     //良品信息采集
-                    if (LogicHandler.UpdateMakeMessage(ms_sncode.Text, ma_code.Text, User.UserSourceCode, User.UserName, "检测合格", out ErrorMessage))
+                    if (LogicHandler.UpdateMakeMessage(ms_sncode.Text, ma_code.Text, User.UserSourceCode, User.UserCode, "检测合格", out ErrorMessage))
                         OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为良品\n", Color.Green);
                         OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为良品\n", Color.Green);
                     else
                     else
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
@@ -252,11 +252,13 @@ namespace UAS_MES.Make
             int RejectCount = ChoosedRejectList.Items.Count;
             int RejectCount = ChoosedRejectList.Items.Count;
             string[] bccode = new string[bc_code.Text == "" ? RejectCount : RejectCount + 1];
             string[] bccode = new string[bc_code.Text == "" ? RejectCount : RejectCount + 1];
             string[] bcremark = new string[bc_code.Text == "" ? RejectCount : RejectCount + 1];
             string[] bcremark = new string[bc_code.Text == "" ? RejectCount : RejectCount + 1];
+            string[] bgcode = new string[bc_code.Text == "" ? RejectCount : RejectCount + 1];
             string ErrorMessage = "";
             string ErrorMessage = "";
             if (AutoBadCode.Checked)
             if (AutoBadCode.Checked)
             {
             {
-                bccode = new string[] { "DefalutValue" };
-                bcremark = new string[] { "DefalutValue" };
+                bccode = new string[] { "DefaultValue" };
+                bcremark = new string[] { "DefaultValue" };
+                bgcode = new string[] { "DefaultValue" };
             }
             }
             else
             else
             {
             {
@@ -271,6 +273,7 @@ namespace UAS_MES.Make
                     //如果长度不相等表示用户自行填写了
                     //如果长度不相等表示用户自行填写了
                     if (bccode.Length != RejectCount)
                     if (bccode.Length != RejectCount)
                     {
                     {
+                        bgcode[0] = bc_groupcode.Text;
                         bccode[0] = bc_code.Text;
                         bccode[0] = bc_code.Text;
                         bcremark[0] = bc_remark.Text;
                         bcremark[0] = bc_remark.Text;
                     }
                     }
@@ -279,17 +282,17 @@ namespace UAS_MES.Make
                     {
                     {
                         if (!(bccode[0] == ChoosedRejectList.Items[bc_code.Text == "" ? i : i - 1].SubItems[1].Text))
                         if (!(bccode[0] == ChoosedRejectList.Items[bc_code.Text == "" ? i : i - 1].SubItems[1].Text))
                         {
                         {
-
+                            bgcode[i] = ChoosedRejectList.Items[bc_code.Text == "" ? i : i - 1].SubItems[1].Text;
                             //获取所有的不良代码
                             //获取所有的不良代码
-                            bccode[i] = ChoosedRejectList.Items[bc_code.Text == "" ? i : i - 1].SubItems[1].Text;
+                            bccode[i] = ChoosedRejectList.Items[bc_code.Text == "" ? i : i - 1].SubItems[2].Text;
                             //获取所有的不良备注
                             //获取所有的不良备注
-                            bcremark[i] = ChoosedRejectList.Items[bc_code.Text == "" ? i : i - 1].SubItems[2].Text;
+                            bcremark[i] = ChoosedRejectList.Items[bc_code.Text == "" ? i : i - 1].SubItems[3].Text;
                         }
                         }
                     }
                     }
                 }
                 }
             }
             }
             //不良信息采集
             //不良信息采集
-            if (LogicHandler.SetTestNGDetail(ms_sncode.Text, ma_code.Text, User.UserName, User.UserSourceCode, "检查未通过", bccode, bcremark, out ErrorMessage))
+            if (LogicHandler.SetTestNGDetail(ms_sncode.Text, ma_code.Text, User.UserName, User.UserSourceCode, "检查未通过", bgcode, bccode, bcremark, out ErrorMessage))
             {
             {
                 OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green);
                 OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green);
                 //清除不良信息
                 //清除不良信息

+ 38 - 38
UAS-MES/FunctionCode/Make/Make_TestCollection.resx

@@ -118,44 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="Save.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Save.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Save.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="CleanInfo.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
   <data name="CleanInfo.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -323,6 +285,44 @@
         ZrIE7d4UdV3k12BxFb3huIgob74jq7eOllIz0Q9sQrs7Ui9wepGrci6vk/HQgzzKm+7IZUgTOpQ2kj7o
         ZrIE7d4UdV3k12BxFb3huIgob74jq7eOllIz0Q9sQrs7Ui9wepGrci6vk/HQgzzKm+7IZUgTOpQ2kj7o
         zB15DHqhq3IurxPdaY8R5U37C1K8XmyU9PGfh25xfV0R/UeTz52y3EtWQ9dqNEP4HY3LfwGra+NvPdw7
         zB15DHqhq3IurxPdaY8R5U37C1K8XmyU9PGfh25xfV0R/UeTz52y3EtWQ9dqNEP4HY3LfwGra+NvPdw7
         fgAAAABJRU5ErkJggg==
         fgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="Save.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Save.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Save.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
 </value>
   </data>
   </data>
 </root>
 </root>

+ 2 - 2
UAS-MES/Main.cs

@@ -78,7 +78,7 @@ namespace UAS_MES
         //窗体加载的时候将headBar的事件委托给指定的函数
         //窗体加载的时候将headBar的事件委托给指定的函数
         private void Main_Load(object sender, EventArgs e)
         private void Main_Load(object sender, EventArgs e)
         {
         {
-            thread = new Thread(DeleteLog); 
+            thread = new Thread(DeleteLog);
             thread.Start();
             thread.Start();
             RefreshDBConnect.Interval = 600 * 1000;
             RefreshDBConnect.Interval = 600 * 1000;
             RefreshDBConnect.Tick += RefreshDB;
             RefreshDBConnect.Tick += RefreshDB;
@@ -221,7 +221,7 @@ namespace UAS_MES
         {
         {
             //移除已打开的Form中的Form
             //移除已打开的Form中的Form
             TabPage tb = e.Control as TabPage;
             TabPage tb = e.Control as TabPage;
-            AccordionMenu.OpenedFormName.Remove("UAS_MES." + tb.Text);
+            AccordionMenu.OpenedFormName.Remove(tb.Name);
             (tb.Controls[0] as Form).Close();
             (tb.Controls[0] as Form).Close();
             //掉用了串口的程序需要在这个步骤关闭串口
             //掉用了串口的程序需要在这个步骤关闭串口
             try
             try

+ 10 - 0
UAS-MES/Properties/Resources.Designer.cs

@@ -580,6 +580,16 @@ namespace UAS_MES.Properties {
             }
             }
         }
         }
         
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap refresh {
+            get {
+                object obj = ResourceManager.GetObject("refresh", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         /// </summary>

+ 3 - 0
UAS-MES/Properties/Resources.resx

@@ -313,4 +313,7 @@
   <data name="lock_open_24px" type="System.Resources.ResXFileRef, System.Windows.Forms">
   <data name="lock_open_24px" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lock_open_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     <value>..\Resources\lock_open_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   </data>
+  <data name="refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
 </root>

+ 3 - 2
UAS-MES/PublicMethod/BaseUtil.cs

@@ -76,6 +76,9 @@ namespace UAS_MES.PublicMethod
             {
             {
                 for (int i = 0; i < collection.Count; i++)
                 for (int i = 0; i < collection.Count; i++)
                 {
                 {
+                    //如果含有子控件则进行递归调用
+                    if (collection[i].Controls.Count > 0)
+                        SetFormValue(collection[i].Controls, dt);
                     string controlName = collection[i].Name;
                     string controlName = collection[i].Name;
                     string controlsTag = collection[i].Tag == null ? "" : collection[i].Tag.ToString();
                     string controlsTag = collection[i].Tag == null ? "" : collection[i].Tag.ToString();
                     //默认给TextBox和Label赋值
                     //默认给TextBox和Label赋值
@@ -121,9 +124,7 @@ namespace UAS_MES.PublicMethod
                                     }
                                     }
                                 }
                                 }
                                 else
                                 else
-                                {
                                     collection[i].Text = dt.Rows[0][j].ToString();
                                     collection[i].Text = dt.Rows[0][j].ToString();
-                                }
                             }
                             }
                         }
                         }
                     }
                     }

+ 6 - 9
UAS-MES/PublicMethod/LogicHandler.cs

@@ -1071,23 +1071,21 @@ namespace UAS_MES.PublicMethod
         /// <param name="iBadRemark"></param>
         /// <param name="iBadRemark"></param>
         /// <param name="oErrorMessage"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
         /// <returns></returns>
-        public static bool SetTestNGDetail(string iSnCode, string iMakeCode, string iUserName, string iSourceCode, string iResult, string[] iBadCode, string[] iBadRemark, out string oErrorMessage)
+        public static bool SetTestNGDetail(string iSnCode, string iMakeCode, string iUserName, string iSourceCode, string iResult, string[] iBadGroupCode, string[] iBadCode, string[] iBadRemark, out string oErrorMessage)
         {
         {
             oErrorMessage = "";
             oErrorMessage = "";
             string StepCode = "";
             string StepCode = "";
             string StepName = "";
             string StepName = "";
             if (iResult == "" || iResult == null)
             if (iResult == "" || iResult == null)
-            {
                 iResult = "检查未通过";
                 iResult = "检查未通过";
-            }
             GetStepCodeAndNameBySource(iSourceCode, ref StepCode, ref StepName);
             GetStepCodeAndNameBySource(iSourceCode, ref StepCode, ref StepName);
             sql.Clear();
             sql.Clear();
             sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,");
             sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,");
-            sql.Append("mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_badtable,mb_soncode,mb_status,mb_badremark)");
-            sql.Append("select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'" + iUserName + "',sysdate,'" + StepCode + "',ms_sourcecode,:bc_code,'',");
+            sql.Append("mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_soncode,mb_status,mb_badremark)");
+            sql.Append("select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'" + iUserName + "',sysdate,'" + StepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
             sql.Append("sp_soncode,'0',:bc_remark from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
             sql.Append("sp_soncode,'0',:bc_remark from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
             sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSnCode + "'");
             sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSnCode + "'");
-            dh.BatchInsert(sql.ToString(), new string[] { "bc_code", "bc_remark" }, iBadCode, iBadRemark);
+            dh.BatchInsert(sql.ToString(), new string[] { "bg_code", "bc_code", "bc_remark" }, iBadGroupCode, iBadCode, iBadRemark);
             //更新序列号状态,待维修,返修工序
             //更新序列号状态,待维修,返修工序
             string st_rstepcode = dh.getFieldDataByCondition("step", "st_rstepcode", "st_code='" + StepCode + "'").ToString();
             string st_rstepcode = dh.getFieldDataByCondition("step", "st_rstepcode", "st_code='" + StepCode + "'").ToString();
             sql.Clear();
             sql.Clear();
@@ -1101,7 +1099,7 @@ namespace UAS_MES.PublicMethod
             //记录操作日志
             //记录操作日志
             InsertMakeProcess(iSnCode, iMakeCode, iResult, iUserName);
             InsertMakeProcess(iSnCode, iMakeCode, iResult, iUserName);
             //判断当前采集点是否为扣料工序cd_ifreduce =-1 则为扣料工序
             //判断当前采集点是否为扣料工序cd_ifreduce =-1 则为扣料工序
-            SetStepFinish(iMakeCode, iSourceCode, iSnCode, iUserName,out oErrorMessage);
+            SetStepFinish(iMakeCode, iSourceCode, iSnCode, iUserName, out oErrorMessage);
             //SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
             //SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
             return true;
             return true;
         }
         }
@@ -1301,7 +1299,7 @@ namespace UAS_MES.PublicMethod
         /// <returns></returns>
         /// <returns></returns>
         public static bool UpdateMakeMessage(string iSnCode, string iMakeCode, string iSourceCode, string iUserName, string iResult, out string oErrorMessage)
         public static bool UpdateMakeMessage(string iSnCode, string iMakeCode, string iSourceCode, string iUserName, string iResult, out string oErrorMessage)
         {
         {
-            SetStepFinish(iMakeCode, iSourceCode, iSnCode, iUserName, out oErrorMessage);
+            return SetStepFinish(iMakeCode, iSourceCode, iSnCode, iUserName, out oErrorMessage);
             //oErrorMessage = "";
             //oErrorMessage = "";
             //string StepCode = "";
             //string StepCode = "";
             //string StepName = "";
             //string StepName = "";
@@ -1430,7 +1428,6 @@ namespace UAS_MES.PublicMethod
             //    CheckNextStepIfQC(iSnCode, iMakeCode, nextstepcode.ToString(), cr_code, iUserName, out oErrorMessage);
             //    CheckNextStepIfQC(iSnCode, iMakeCode, nextstepcode.ToString(), cr_code, iUserName, out oErrorMessage);
             //// 将数据插入craftmaterial表
             //// 将数据插入craftmaterial表
             //SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
             //SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
-            return true;
         }
         }
 
 
         /// <summary>
         /// <summary>

BIN
UAS-MES/Resources/refresh.png


+ 47 - 7
UAS-MES/UAS-MES.csproj

@@ -40,6 +40,7 @@
     <MinimumRequiredVersion>1.0.0.59</MinimumRequiredVersion>
     <MinimumRequiredVersion>1.0.0.59</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <WebPage>publish.htm</WebPage>
+    <ApplicationRevision>196</ApplicationRevision>
     <ApplicationRevision>181</ApplicationRevision>
     <ApplicationRevision>181</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <UseApplicationTrust>true</UseApplicationTrust>
@@ -200,6 +201,12 @@
     <Compile Include="CustomControl\ComBoxWithFocus\SerialPortCombox.Designer.cs">
     <Compile Include="CustomControl\ComBoxWithFocus\SerialPortCombox.Designer.cs">
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
     </Compile>
     </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">
     <Compile Include="CustomControl\CustomTabControl\CustomTabControl.cs">
       <SubType>Component</SubType>
       <SubType>Component</SubType>
     </Compile>
     </Compile>
@@ -249,6 +256,12 @@
     <Compile Include="CustomControl\Pagination\Pagination.Designer.cs">
     <Compile Include="CustomControl\Pagination\Pagination.Designer.cs">
       <DependentUpon>Pagination.cs</DependentUpon>
       <DependentUpon>Pagination.cs</DependentUpon>
     </Compile>
     </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">
     <Compile Include="CustomControl\ProcessBar\ProcessBar.cs">
       <SubType>UserControl</SubType>
       <SubType>UserControl</SubType>
     </Compile>
     </Compile>
@@ -279,6 +292,18 @@
     <Compile Include="CustomControl\TextBoxWithIcon\EnterTextBox.Designer.cs">
     <Compile Include="CustomControl\TextBoxWithIcon\EnterTextBox.Designer.cs">
       <DependentUpon>EnterTextBox.cs</DependentUpon>
       <DependentUpon>EnterTextBox.cs</DependentUpon>
     </Compile>
     </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">
     <Compile Include="CustomControl\TextBoxWithIcon\NumOnlyTextBox.cs">
       <SubType>Component</SubType>
       <SubType>Component</SubType>
     </Compile>
     </Compile>
@@ -357,6 +382,12 @@
     <Compile Include="Form1.Designer.cs">
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
     </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">
     <Compile Include="Login.cs">
       <SubType>Form</SubType>
       <SubType>Form</SubType>
     </Compile>
     </Compile>
@@ -689,10 +720,6 @@
     <Compile Include="FunctionCode\Special\Special_MixPackage.Designer.cs">
     <Compile Include="FunctionCode\Special\Special_MixPackage.Designer.cs">
       <DependentUpon>Special_MixPackage.cs</DependentUpon>
       <DependentUpon>Special_MixPackage.cs</DependentUpon>
     </Compile>
     </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">
     <Compile Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.cs">
       <SubType>Form</SubType>
       <SubType>Form</SubType>
     </Compile>
     </Compile>
@@ -729,6 +756,9 @@
     <EmbeddedResource Include="CustomControl\ComBoxWithFocus\SerialPortCombox.resx">
     <EmbeddedResource Include="CustomControl\ComBoxWithFocus\SerialPortCombox.resx">
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\CustomCheckBox\LockCheckBox.resx">
+      <DependentUpon>LockCheckBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\CustomTabControl\CustomTabControl.resx">
     <EmbeddedResource Include="CustomControl\CustomTabControl\CustomTabControl.resx">
       <DependentUpon>CustomTabControl.cs</DependentUpon>
       <DependentUpon>CustomTabControl.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
@@ -744,6 +774,9 @@
     <EmbeddedResource Include="CustomControl\Pagination\Pagination.resx">
     <EmbeddedResource Include="CustomControl\Pagination\Pagination.resx">
       <DependentUpon>Pagination.cs</DependentUpon>
       <DependentUpon>Pagination.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\Pagination\PaginationDbFind.resx">
+      <DependentUpon>PaginationDbFind.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\ProcessBar\ProcessBar.resx">
     <EmbeddedResource Include="CustomControl\ProcessBar\ProcessBar.resx">
       <DependentUpon>ProcessBar.cs</DependentUpon>
       <DependentUpon>ProcessBar.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
@@ -753,6 +786,12 @@
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\EnterTextBox.resx">
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\EnterTextBox.resx">
       <DependentUpon>EnterTextBox.cs</DependentUpon>
       <DependentUpon>EnterTextBox.cs</DependentUpon>
     </EmbeddedResource>
     </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">
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\NumOnlyTextBox.resx">
       <DependentUpon>NumOnlyTextBox.cs</DependentUpon>
       <DependentUpon>NumOnlyTextBox.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
@@ -780,6 +819,9 @@
     <EmbeddedResource Include="Form1.resx">
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Special\Special_MendLabel.resx">
+      <DependentUpon>Special_MendLabel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Login.resx">
     <EmbeddedResource Include="Login.resx">
       <DependentUpon>Login.cs</DependentUpon>
       <DependentUpon>Login.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
@@ -932,9 +974,6 @@
     <EmbeddedResource Include="FunctionCode\Special\Special_MixPackage.resx">
     <EmbeddedResource Include="FunctionCode\Special\Special_MixPackage.resx">
       <DependentUpon>Special_MixPackage.cs</DependentUpon>
       <DependentUpon>Special_MixPackage.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Specail_MendLabel.resx">
-      <DependentUpon>Specail_MendLabel.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.resx">
     <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.resx">
       <DependentUpon>SystemSetting_LabelMaintain.cs</DependentUpon>
       <DependentUpon>SystemSetting_LabelMaintain.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
@@ -1040,6 +1079,7 @@
     <Content Include="Resources\People_48px_500819_easyicon.net.png" />
     <Content Include="Resources\People_48px_500819_easyicon.net.png" />
     <Content Include="Resources\plus.gif" />
     <Content Include="Resources\plus.gif" />
     <Content Include="Resources\preview_16px_25980_easyicon.net.png" />
     <Content Include="Resources\preview_16px_25980_easyicon.net.png" />
+    <None Include="Resources\refresh.png" />
     <Content Include="Resources\search_16px_1202802_easyicon.net.png" />
     <Content Include="Resources\search_16px_1202802_easyicon.net.png" />
     <Content Include="Resources\Sound\Windows Background.wav" />
     <Content Include="Resources\Sound\Windows Background.wav" />
     <Content Include="Resources\two_arrow_left.png" />
     <Content Include="Resources\two_arrow_left.png" />

Some files were not shown because too many files changed in this diff