Browse Source

拆解界面新增不良代码功能不勾选不能新增代码

Hcsy 4 years ago
parent
commit
54a0de6dc0

+ 21 - 21
UAS-MES/FunctionCode/Make/Make_NewBadCode.cs

@@ -111,27 +111,27 @@ namespace UAS_MES.Make
                     }
                 }
             }
-            if (CheckedNum == 0)
-            {
-                for (int i = WaitRejectList.Items.Count - 1; i >= 0; i--)
-                {
-                    AddToReject = false;
-                    for (int j = 0; j < ChoosedRejectList.Items.Count; j++)
-                    {
-                        if ((ChoosedRejectList.Items[j].SubItems[3].Text == WaitRejectList.Items[i].SubItems[3].Text))
-                        {
-                            AddToReject = true;
-                            break;
-                        }
-                    }
-                    if (!AddToReject)
-                    {                      
-                        ChoosedRejectList.Items.Add((ListViewItem)WaitRejectList.Items[i].Clone());
-                        WaitRejectList.Items[i].Remove();
-                        CheckedNum++;
-                    }
-                }
-            }
+            //if (CheckedNum == 0)
+            //{
+            //    for (int i = WaitRejectList.Items.Count - 1; i >= 0; i--)
+            //    {
+            //        AddToReject = false;
+            //        for (int j = 0; j < ChoosedRejectList.Items.Count; j++)
+            //        {
+            //            if ((ChoosedRejectList.Items[j].SubItems[3].Text == WaitRejectList.Items[i].SubItems[3].Text))
+            //            {
+            //                AddToReject = true;
+            //                break;
+            //            }
+            //        }
+            //        if (!AddToReject)
+            //        {                      
+            //            ChoosedRejectList.Items.Add((ListViewItem)WaitRejectList.Items[i].Clone());
+            //            WaitRejectList.Items[i].Remove();
+            //            CheckedNum++;
+            //        }
+            //    }
+            //}
         }
 
         private void WaitReject_Click(object sender, EventArgs e)

+ 21 - 21
UAS-MES/FunctionCode/Make/Make_NewBadCode_DE.cs

@@ -115,27 +115,27 @@ namespace UAS_MES.Make
                     }
                 }
             }
-            if (CheckedNum == 0)
-            {
-                for (int i = WaitRejectList.Items.Count - 1; i >= 0; i--)
-                {
-                    AddToReject = false;
-                    for (int j = 0; j < ChoosedRejectList.Items.Count; j++)
-                    {
-                        if ((ChoosedRejectList.Items[j].SubItems[3].Text == WaitRejectList.Items[i].SubItems[3].Text))
-                        {
-                            AddToReject = true;
-                            break;
-                        }
-                    }
-                    if (!AddToReject)
-                    {
-                        ChoosedRejectList.Items.Add((ListViewItem)WaitRejectList.Items[i].Clone());
-                        WaitRejectList.Items[i].Remove();
-                        CheckedNum++;
-                    }
-                }
-            }
+            //if (CheckedNum == 0)
+            //{
+            //    for (int i = WaitRejectList.Items.Count - 1; i >= 0; i--)
+            //    {
+            //        AddToReject = false;
+            //        for (int j = 0; j < ChoosedRejectList.Items.Count; j++)
+            //        {
+            //            if ((ChoosedRejectList.Items[j].SubItems[3].Text == WaitRejectList.Items[i].SubItems[3].Text))
+            //            {
+            //                AddToReject = true;
+            //                break;
+            //            }
+            //        }
+            //        if (!AddToReject)
+            //        {
+            //            ChoosedRejectList.Items.Add((ListViewItem)WaitRejectList.Items[i].Clone());
+            //            WaitRejectList.Items[i].Remove();
+            //            CheckedNum++;
+            //        }
+            //    }
+            //}
         }
 
         private void WaitReject_Click(object sender, EventArgs e)

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

@@ -42,6 +42,12 @@
             this.label1 = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.ob_miacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.ob_maacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.ob_cracceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label3 = new System.Windows.Forms.Label();
             this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_sampleqty = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.ob_sampleqty_label = new System.Windows.Forms.Label();
@@ -68,12 +74,6 @@
             this.ChooseAll = new UAS_MES.CustomControl.ButtonUtil.ChooseAllButton();
             this.ob_reworkcode = new System.Windows.Forms.Label();
             this.ob_source = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.ob_cracceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_maacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.ob_miacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.label5 = new System.Windows.Forms.Label();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -83,7 +83,7 @@
             // 
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(517, 49);
+            this.ms_sncode_label.Location = new System.Drawing.Point(517, 40);
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Size = new System.Drawing.Size(58, 21);
             this.ms_sncode_label.TabIndex = 152;
@@ -93,7 +93,7 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno_label.Location = new System.Drawing.Point(21, 45);
+            this.ob_checkno_label.Location = new System.Drawing.Point(21, 36);
             this.ob_checkno_label.Name = "ob_checkno_label";
             this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
             this.ob_checkno_label.TabIndex = 154;
@@ -126,7 +126,7 @@
             // 
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(264, 47);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(264, 38);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
             this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
             this.obd_outboxcode_label.TabIndex = 157;
@@ -136,7 +136,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(519, 88);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(519, 79);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(58, 21);
             this.ob_batchqty_label.TabIndex = 159;
@@ -146,7 +146,7 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(21, 88);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(21, 79);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
             this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.ob_prodcode_label.TabIndex = 163;
@@ -186,7 +186,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(764, 88);
+            this.label1.Location = new System.Drawing.Point(764, 79);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 186;
@@ -196,7 +196,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(264, 88);
+            this.pr_detail_label.Location = new System.Drawing.Point(264, 79);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
@@ -220,11 +220,86 @@
             this.panel1.Controls.Add(this.al_code);
             this.panel1.Controls.Add(this.ob_aqlcode_label);
             this.panel1.Controls.Add(this.ob_maxacceptqty_label);
-            this.panel1.Location = new System.Drawing.Point(25, 126);
+            this.panel1.Location = new System.Drawing.Point(25, 112);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(745, 96);
             this.panel1.TabIndex = 193;
             // 
+            // ob_miacceptqty
+            // 
+            this.ob_miacceptqty.AllPower = null;
+            this.ob_miacceptqty.BackColor = System.Drawing.Color.White;
+            this.ob_miacceptqty.ID = null;
+            this.ob_miacceptqty.Location = new System.Drawing.Point(561, 42);
+            this.ob_miacceptqty.Name = "ob_miacceptqty";
+            this.ob_miacceptqty.Power = null;
+            this.ob_miacceptqty.Size = new System.Drawing.Size(131, 21);
+            this.ob_miacceptqty.Str = null;
+            this.ob_miacceptqty.Str1 = null;
+            this.ob_miacceptqty.Str2 = null;
+            this.ob_miacceptqty.TabIndex = 201;
+            this.ob_miacceptqty.Tag = "NoAuto";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.Location = new System.Drawing.Point(509, 40);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(47, 21);
+            this.label5.TabIndex = 200;
+            this.label5.Text = "MI数";
+            // 
+            // ob_maacceptqty
+            // 
+            this.ob_maacceptqty.AllPower = null;
+            this.ob_maacceptqty.BackColor = System.Drawing.Color.White;
+            this.ob_maacceptqty.ID = null;
+            this.ob_maacceptqty.Location = new System.Drawing.Point(340, 42);
+            this.ob_maacceptqty.Name = "ob_maacceptqty";
+            this.ob_maacceptqty.Power = null;
+            this.ob_maacceptqty.Size = new System.Drawing.Size(131, 21);
+            this.ob_maacceptqty.Str = null;
+            this.ob_maacceptqty.Str1 = null;
+            this.ob_maacceptqty.Str2 = null;
+            this.ob_maacceptqty.TabIndex = 199;
+            this.ob_maacceptqty.Tag = "NoAuto";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.Location = new System.Drawing.Point(289, 41);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(53, 21);
+            this.label4.TabIndex = 198;
+            this.label4.Text = "MA数";
+            // 
+            // ob_cracceptqty
+            // 
+            this.ob_cracceptqty.AllPower = null;
+            this.ob_cracceptqty.BackColor = System.Drawing.Color.White;
+            this.ob_cracceptqty.ID = null;
+            this.ob_cracceptqty.Location = new System.Drawing.Point(88, 42);
+            this.ob_cracceptqty.Name = "ob_cracceptqty";
+            this.ob_cracceptqty.Power = null;
+            this.ob_cracceptqty.Size = new System.Drawing.Size(154, 21);
+            this.ob_cracceptqty.Str = null;
+            this.ob_cracceptqty.Str1 = null;
+            this.ob_cracceptqty.Str2 = null;
+            this.ob_cracceptqty.TabIndex = 197;
+            this.ob_cracceptqty.Tag = "NoAuto";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.Location = new System.Drawing.Point(12, 40);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(47, 21);
+            this.label3.TabIndex = 196;
+            this.label3.Text = "CR数";
+            // 
             // ob_maxngacceptqty
             // 
             this.ob_maxngacceptqty.AllPower = null;
@@ -282,7 +357,7 @@
             this.al_code.DBTitle = null;
             this.al_code.FormName = null;
             this.al_code.Location = new System.Drawing.Point(89, 11);
-            this.al_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.al_code.Margin = new System.Windows.Forms.Padding(2);
             this.al_code.Name = "al_code";
             this.al_code.Power = null;
             this.al_code.ReturnData = null;
@@ -301,8 +376,8 @@
             this.pr_detail.BackColor = System.Drawing.Color.White;
             this.pr_detail.Enabled = false;
             this.pr_detail.ID = null;
-            this.pr_detail.Location = new System.Drawing.Point(344, 88);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.pr_detail.Location = new System.Drawing.Point(344, 79);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(2);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Power = null;
             this.pr_detail.ReadOnly = true;
@@ -320,8 +395,8 @@
             this.pr_code.Condition = null;
             this.pr_code.DBTitle = null;
             this.pr_code.FormName = null;
-            this.pr_code.Location = new System.Drawing.Point(852, 88);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.pr_code.Location = new System.Drawing.Point(852, 79);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(2);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
             this.pr_code.ReturnData = null;
@@ -340,7 +415,7 @@
             this.ob_status.BackColor = System.Drawing.Color.White;
             this.ob_status.Enabled = false;
             this.ob_status.ID = null;
-            this.ob_status.Location = new System.Drawing.Point(875, 127);
+            this.ob_status.Location = new System.Drawing.Point(875, 118);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
             this.ob_status.Size = new System.Drawing.Size(136, 21);
@@ -354,7 +429,7 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(777, 252);
+            this.OperateResult.Location = new System.Drawing.Point(777, 265);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(233, 318);
             this.OperateResult.TabIndex = 177;
@@ -368,7 +443,7 @@
             this.Clean.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(859, 583);
+            this.Clean.Location = new System.Drawing.Point(859, 596);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
@@ -388,7 +463,7 @@
             this.GetBatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(768, 51);
+            this.GetBatch.Location = new System.Drawing.Point(768, 42);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
@@ -408,7 +483,7 @@
             this.Save.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(368, 583);
+            this.Save.Location = new System.Drawing.Point(368, 596);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
@@ -431,7 +506,7 @@
             this.ci_kind,
             this.oi_sampleqty});
             this.CheckTypeDGV.EnableContentClick = true;
-            this.CheckTypeDGV.Location = new System.Drawing.Point(25, 252);
+            this.CheckTypeDGV.Location = new System.Drawing.Point(25, 265);
             this.CheckTypeDGV.Name = "CheckTypeDGV";
             this.CheckTypeDGV.RowTemplate.Height = 23;
             this.CheckTypeDGV.Size = new System.Drawing.Size(745, 318);
@@ -488,7 +563,7 @@
             this.ob_prodcode.BackColor = System.Drawing.Color.White;
             this.ob_prodcode.Enabled = false;
             this.ob_prodcode.ID = null;
-            this.ob_prodcode.Location = new System.Drawing.Point(101, 88);
+            this.ob_prodcode.Location = new System.Drawing.Point(101, 79);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
             this.ob_prodcode.Size = new System.Drawing.Size(136, 21);
@@ -504,7 +579,7 @@
             this.ob_nowcheckqty.BackColor = System.Drawing.Color.White;
             this.ob_nowcheckqty.Enabled = false;
             this.ob_nowcheckqty.ID = null;
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(596, 88);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(596, 79);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
             this.ob_nowcheckqty.ReadOnly = true;
@@ -520,7 +595,7 @@
             this.obd_outboxcode.AllPower = null;
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(344, 49);
+            this.obd_outboxcode.Location = new System.Drawing.Point(344, 40);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
             this.obd_outboxcode.Size = new System.Drawing.Size(136, 21);
@@ -536,7 +611,7 @@
             this.ob_checkno.AllPower = null;
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(101, 47);
+            this.ob_checkno.Location = new System.Drawing.Point(101, 38);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = null;
             this.ob_checkno.Size = new System.Drawing.Size(136, 21);
@@ -552,7 +627,7 @@
             this.ms_sncode.AllPower = null;
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(596, 51);
+            this.ms_sncode.Location = new System.Drawing.Point(596, 42);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
             this.ms_sncode.Size = new System.Drawing.Size(136, 21);
@@ -565,8 +640,8 @@
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(25, 229);
-            this.ChooseAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ChooseAll.Location = new System.Drawing.Point(25, 242);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(2);
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.Size = new System.Drawing.Size(38, 18);
             this.ChooseAll.TabIndex = 194;
@@ -577,7 +652,7 @@
             // 
             this.ob_reworkcode.AutoSize = true;
             this.ob_reworkcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_reworkcode.Location = new System.Drawing.Point(796, 186);
+            this.ob_reworkcode.Location = new System.Drawing.Point(796, 172);
             this.ob_reworkcode.Name = "ob_reworkcode";
             this.ob_reworkcode.Size = new System.Drawing.Size(0, 21);
             this.ob_reworkcode.TabIndex = 195;
@@ -587,87 +662,12 @@
             // 
             this.ob_source.AutoSize = true;
             this.ob_source.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_source.Location = new System.Drawing.Point(796, 158);
+            this.ob_source.Location = new System.Drawing.Point(796, 144);
             this.ob_source.Name = "ob_source";
             this.ob_source.Size = new System.Drawing.Size(0, 21);
             this.ob_source.TabIndex = 196;
             this.ob_source.Visible = false;
             // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(12, 40);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(47, 21);
-            this.label3.TabIndex = 196;
-            this.label3.Text = "CR数";
-            // 
-            // ob_cracceptqty
-            // 
-            this.ob_cracceptqty.AllPower = null;
-            this.ob_cracceptqty.BackColor = System.Drawing.Color.White;
-            this.ob_cracceptqty.ID = null;
-            this.ob_cracceptqty.Location = new System.Drawing.Point(88, 42);
-            this.ob_cracceptqty.Name = "ob_cracceptqty";
-            this.ob_cracceptqty.Power = null;
-            this.ob_cracceptqty.Size = new System.Drawing.Size(154, 21);
-            this.ob_cracceptqty.Str = null;
-            this.ob_cracceptqty.Str1 = null;
-            this.ob_cracceptqty.Str2 = null;
-            this.ob_cracceptqty.TabIndex = 197;
-            this.ob_cracceptqty.Tag = "NoAuto";
-            // 
-            // ob_maacceptqty
-            // 
-            this.ob_maacceptqty.AllPower = null;
-            this.ob_maacceptqty.BackColor = System.Drawing.Color.White;
-            this.ob_maacceptqty.ID = null;
-            this.ob_maacceptqty.Location = new System.Drawing.Point(340, 42);
-            this.ob_maacceptqty.Name = "ob_maacceptqty";
-            this.ob_maacceptqty.Power = null;
-            this.ob_maacceptqty.Size = new System.Drawing.Size(131, 21);
-            this.ob_maacceptqty.Str = null;
-            this.ob_maacceptqty.Str1 = null;
-            this.ob_maacceptqty.Str2 = null;
-            this.ob_maacceptqty.TabIndex = 199;
-            this.ob_maacceptqty.Tag = "NoAuto";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(289, 41);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(53, 21);
-            this.label4.TabIndex = 198;
-            this.label4.Text = "MA数";
-            // 
-            // ob_miacceptqty
-            // 
-            this.ob_miacceptqty.AllPower = null;
-            this.ob_miacceptqty.BackColor = System.Drawing.Color.White;
-            this.ob_miacceptqty.ID = null;
-            this.ob_miacceptqty.Location = new System.Drawing.Point(561, 42);
-            this.ob_miacceptqty.Name = "ob_miacceptqty";
-            this.ob_miacceptqty.Power = null;
-            this.ob_miacceptqty.Size = new System.Drawing.Size(131, 21);
-            this.ob_miacceptqty.Str = null;
-            this.ob_miacceptqty.Str1 = null;
-            this.ob_miacceptqty.Str2 = null;
-            this.ob_miacceptqty.TabIndex = 201;
-            this.ob_miacceptqty.Tag = "NoAuto";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(509, 40);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(47, 21);
-            this.label5.TabIndex = 200;
-            this.label5.Text = "MI数";
-            // 
             // OQC_PlanMaintain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

+ 18 - 3
UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.resx

@@ -177,7 +177,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -308,7 +308,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -439,7 +439,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -526,4 +526,19 @@
   <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_kind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>