万利达OQC采集逻辑需求调整

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

@@ -48,6 +48,7 @@
             this.Remark = new System.Windows.Forms.RichTextBox();
             this.label5 = new System.Windows.Forms.Label();
             this.ob_status_label = new System.Windows.Forms.Label();
+            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_id = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -71,7 +72,18 @@
             this.WithdrawRejection = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.BatchPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_miacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.ob_maacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.ob_cracceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.ob_miqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label11 = new System.Windows.Forms.Label();
+            this.ob_maqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label10 = new System.Windows.Forms.Label();
+            this.ob_crqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label8 = new System.Windows.Forms.Label();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -79,10 +91,9 @@
             // 
             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(680, 328);
-            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(510, 262);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(58, 21);
             this.ob_batchqty_label.TabIndex = 158;
             this.ob_batchqty_label.Text = "实批数";
             // 
@@ -90,10 +101,9 @@
             // 
             this.ob_result_label.AutoSize = true;
             this.ob_result_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_result_label.Location = new System.Drawing.Point(680, 288);
-            this.ob_result_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_result_label.Location = new System.Drawing.Point(510, 230);
             this.ob_result_label.Name = "ob_result_label";
-            this.ob_result_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_result_label.Size = new System.Drawing.Size(74, 21);
             this.ob_result_label.TabIndex = 166;
             this.ob_result_label.Text = "判定结果";
             // 
@@ -101,10 +111,9 @@
             // 
             this.ob_okqty_label.AutoSize = true;
             this.ob_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_okqty_label.Location = new System.Drawing.Point(680, 414);
-            this.ob_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_okqty_label.Location = new System.Drawing.Point(510, 331);
             this.ob_okqty_label.Name = "ob_okqty_label";
-            this.ob_okqty_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_okqty_label.Size = new System.Drawing.Size(58, 21);
             this.ob_okqty_label.TabIndex = 160;
             this.ob_okqty_label.Text = "合格数";
             // 
@@ -112,10 +121,9 @@
             // 
             this.ob_ngqty_label.AutoSize = true;
             this.ob_ngqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_ngqty_label.Location = new System.Drawing.Point(680, 456);
-            this.ob_ngqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_ngqty_label.Location = new System.Drawing.Point(510, 365);
             this.ob_ngqty_label.Name = "ob_ngqty_label";
-            this.ob_ngqty_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_ngqty_label.Size = new System.Drawing.Size(74, 21);
             this.ob_ngqty_label.TabIndex = 162;
             this.ob_ngqty_label.Text = "不合格数";
             // 
@@ -123,10 +131,9 @@
             // 
             this.oi_checkqty_label.AutoSize = true;
             this.oi_checkqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.oi_checkqty_label.Location = new System.Drawing.Point(680, 370);
-            this.oi_checkqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.oi_checkqty_label.Location = new System.Drawing.Point(510, 296);
             this.oi_checkqty_label.Name = "oi_checkqty_label";
-            this.oi_checkqty_label.Size = new System.Drawing.Size(72, 27);
+            this.oi_checkqty_label.Size = new System.Drawing.Size(58, 21);
             this.oi_checkqty_label.TabIndex = 164;
             this.oi_checkqty_label.Text = "抽检数";
             // 
@@ -136,10 +143,9 @@
             this.ReworkRequire.Checked = true;
             this.ReworkRequire.CheckState = System.Windows.Forms.CheckState.Checked;
             this.ReworkRequire.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ReworkRequire.Location = new System.Drawing.Point(163, 656);
-            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4);
+            this.ReworkRequire.Location = new System.Drawing.Point(122, 525);
             this.ReworkRequire.Name = "ReworkRequire";
-            this.ReworkRequire.Size = new System.Drawing.Size(154, 31);
+            this.ReworkRequire.Size = new System.Drawing.Size(125, 25);
             this.ReworkRequire.TabIndex = 168;
             this.ReworkRequire.Text = "发起返工需求";
             this.ReworkRequire.UseVisualStyleBackColor = true;
@@ -148,10 +154,9 @@
             // 
             this.ob_aqlcode_label.AutoSize = true;
             this.ob_aqlcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_aqlcode_label.Location = new System.Drawing.Point(680, 498);
-            this.ob_aqlcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_aqlcode_label.Location = new System.Drawing.Point(510, 398);
             this.ob_aqlcode_label.Name = "ob_aqlcode_label";
-            this.ob_aqlcode_label.Size = new System.Drawing.Size(52, 27);
+            this.ob_aqlcode_label.Size = new System.Drawing.Size(42, 21);
             this.ob_aqlcode_label.TabIndex = 169;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -159,10 +164,9 @@
             // 
             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(352, 181);
-            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(264, 145);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.ob_prodcode_label.TabIndex = 218;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -170,10 +174,9 @@
             // 
             this.ob_makecode_label.AutoSize = true;
             this.ob_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_makecode_label.Location = new System.Drawing.Point(11, 181);
-            this.ob_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_makecode_label.Location = new System.Drawing.Point(8, 145);
             this.ob_makecode_label.Name = "ob_makecode_label";
-            this.ob_makecode_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_makecode_label.Size = new System.Drawing.Size(58, 21);
             this.ob_makecode_label.TabIndex = 216;
             this.ob_makecode_label.Text = "工单号";
             // 
@@ -181,10 +184,9 @@
             // 
             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(11, 51);
-            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_checkno_label.Location = new System.Drawing.Point(8, 41);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
             this.ob_checkno_label.TabIndex = 214;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -192,10 +194,9 @@
             // 
             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(11, 91);
-            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(8, 73);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
             this.obd_outboxcode_label.TabIndex = 212;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -203,10 +204,9 @@
             // 
             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(11, 134);
-            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_sncode_label.Location = new System.Drawing.Point(8, 107);
             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(58, 21);
             this.ms_sncode_label.TabIndex = 210;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -217,9 +217,8 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1300, 38);
+            this.panel2.Size = new System.Drawing.Size(975, 30);
             this.panel2.TabIndex = 220;
             this.panel2.Tag = "NoAuto";
             // 
@@ -228,10 +227,9 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(16, 5);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(12, 4);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(157, 27);
+            this.label1.Size = new System.Drawing.Size(127, 21);
             this.label1.TabIndex = 0;
             this.label1.Text = "OQC批结果判定";
             // 
@@ -239,10 +237,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(48, 568);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Location = new System.Drawing.Point(36, 454);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(571, 24);
+            this.label3.Size = new System.Drawing.Size(444, 20);
             this.label3.TabIndex = 222;
             this.label3.Text = "--说明:如何物料没有维护AQL标准，需手动填写最大不合格允许通过数";
             // 
@@ -250,19 +247,17 @@
             // 
             this.ob_maxngacceptqty_label.AutoSize = true;
             this.ob_maxngacceptqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(48, 532);
-            this.ob_maxngacceptqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(36, 426);
             this.ob_maxngacceptqty_label.Name = "ob_maxngacceptqty_label";
-            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(212, 27);
+            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(170, 21);
             this.ob_maxngacceptqty_label.TabIndex = 223;
             this.ob_maxngacceptqty_label.Text = "最大不合格允许通过数";
             // 
             // Remark
             // 
-            this.Remark.Location = new System.Drawing.Point(117, 239);
-            this.Remark.Margin = new System.Windows.Forms.Padding(4);
+            this.Remark.Location = new System.Drawing.Point(88, 191);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(547, 280);
+            this.Remark.Size = new System.Drawing.Size(411, 225);
             this.Remark.TabIndex = 225;
             this.Remark.Text = "";
             // 
@@ -270,10 +265,9 @@
             // 
             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(11, 239);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Location = new System.Drawing.Point(8, 191);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(52, 27);
+            this.label5.Size = new System.Drawing.Size(42, 21);
             this.label5.TabIndex = 226;
             this.label5.Text = "备注";
             // 
@@ -281,24 +275,37 @@
             // 
             this.ob_status_label.AutoSize = true;
             this.ob_status_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_status_label.Location = new System.Drawing.Point(680, 246);
-            this.ob_status_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_status_label.Location = new System.Drawing.Point(510, 197);
             this.ob_status_label.Name = "ob_status_label";
-            this.ob_status_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_status_label.Size = new System.Drawing.Size(74, 21);
             this.ob_status_label.TabIndex = 232;
             this.ob_status_label.Text = "批次状态";
             // 
+            // ob_maxngacceptqty
+            // 
+            this.ob_maxngacceptqty.AllPower = "";
+            this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
+            this.ob_maxngacceptqty.ID = null;
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(201, 427);
+            this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
+            this.ob_maxngacceptqty.Power = "";
+            this.ob_maxngacceptqty.Size = new System.Drawing.Size(194, 21);
+            this.ob_maxngacceptqty.Str = null;
+            this.ob_maxngacceptqty.Str1 = null;
+            this.ob_maxngacceptqty.Str2 = null;
+            this.ob_maxngacceptqty.TabIndex = 233;
+            this.ob_maxngacceptqty.Tag = "NoAuto";
+            // 
             // ob_status
             // 
             this.ob_status.AllPower = null;
             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(800, 246);
-            this.ob_status.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_status.Location = new System.Drawing.Point(600, 197);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
-            this.ob_status.Size = new System.Drawing.Size(195, 25);
+            this.ob_status.Size = new System.Drawing.Size(147, 21);
             this.ob_status.Str = null;
             this.ob_status.Str1 = null;
             this.ob_status.Str2 = null;
@@ -311,11 +318,10 @@
             this.ob_source.BackColor = System.Drawing.Color.White;
             this.ob_source.Enabled = false;
             this.ob_source.ID = null;
-            this.ob_source.Location = new System.Drawing.Point(1012, 94);
-            this.ob_source.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_source.Location = new System.Drawing.Point(660, 534);
             this.ob_source.Name = "ob_source";
             this.ob_source.Power = null;
-            this.ob_source.Size = new System.Drawing.Size(195, 25);
+            this.ob_source.Size = new System.Drawing.Size(147, 21);
             this.ob_source.Str = null;
             this.ob_source.Str1 = null;
             this.ob_source.Str2 = null;
@@ -329,11 +335,10 @@
             this.ob_id.BackColor = System.Drawing.Color.White;
             this.ob_id.Enabled = false;
             this.ob_id.ID = null;
-            this.ob_id.Location = new System.Drawing.Point(1012, 69);
-            this.ob_id.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_id.Location = new System.Drawing.Point(660, 514);
             this.ob_id.Name = "ob_id";
             this.ob_id.Power = null;
-            this.ob_id.Size = new System.Drawing.Size(195, 25);
+            this.ob_id.Size = new System.Drawing.Size(147, 21);
             this.ob_id.Str = null;
             this.ob_id.Str1 = null;
             this.ob_id.Str2 = null;
@@ -344,10 +349,9 @@
             // 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(1013, 214);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(760, 171);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(279, 398);
+            this.OperateResult.Size = new System.Drawing.Size(210, 319);
             this.OperateResult.TabIndex = 227;
             this.OperateResult.Text = "";
             // 
@@ -358,13 +362,12 @@
             this.GetBatch.DownImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.DownImage")));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(681, 182);
-            this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
+            this.GetBatch.Location = new System.Drawing.Point(511, 146);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifread";
-            this.GetBatch.Size = new System.Drawing.Size(80, 30);
+            this.GetBatch.Size = new System.Drawing.Size(60, 24);
             this.GetBatch.TabIndex = 221;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -376,11 +379,10 @@
             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(473, 186);
-            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_prodcode.Location = new System.Drawing.Point(355, 149);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
-            this.ob_prodcode.Size = new System.Drawing.Size(191, 25);
+            this.ob_prodcode.Size = new System.Drawing.Size(144, 21);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -393,11 +395,10 @@
             this.ob_makecode.BackColor = System.Drawing.Color.White;
             this.ob_makecode.Enabled = false;
             this.ob_makecode.ID = null;
-            this.ob_makecode.Location = new System.Drawing.Point(117, 182);
-            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_makecode.Location = new System.Drawing.Point(88, 146);
             this.ob_makecode.Name = "ob_makecode";
             this.ob_makecode.Power = null;
-            this.ob_makecode.Size = new System.Drawing.Size(212, 25);
+            this.ob_makecode.Size = new System.Drawing.Size(160, 21);
             this.ob_makecode.Str = null;
             this.ob_makecode.Str1 = null;
             this.ob_makecode.Str2 = null;
@@ -409,11 +410,10 @@
             this.ob_checkno.AllPower = "";
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(117, 54);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_checkno.Location = new System.Drawing.Point(88, 43);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "";
-            this.ob_checkno.Size = new System.Drawing.Size(547, 25);
+            this.ob_checkno.Size = new System.Drawing.Size(411, 21);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -426,11 +426,10 @@
             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(117, 94);
-            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.obd_outboxcode.Location = new System.Drawing.Point(88, 75);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(547, 25);
+            this.obd_outboxcode.Size = new System.Drawing.Size(411, 21);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -443,11 +442,10 @@
             this.ms_sncode.AllPower = "";
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(117, 136);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.ms_sncode.Location = new System.Drawing.Point(88, 109);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "";
-            this.ms_sncode.Size = new System.Drawing.Size(547, 25);
+            this.ms_sncode.Size = new System.Drawing.Size(411, 21);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -461,11 +459,10 @@
             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(800, 328);
-            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(600, 262);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(195, 25);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(147, 21);
             this.ob_nowcheckqty.Str = null;
             this.ob_nowcheckqty.Str1 = null;
             this.ob_nowcheckqty.Str2 = null;
@@ -478,11 +475,10 @@
             this.ob_okqty.BackColor = System.Drawing.Color.White;
             this.ob_okqty.Enabled = false;
             this.ob_okqty.ID = null;
-            this.ob_okqty.Location = new System.Drawing.Point(800, 414);
-            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_okqty.Location = new System.Drawing.Point(600, 331);
             this.ob_okqty.Name = "ob_okqty";
             this.ob_okqty.Power = null;
-            this.ob_okqty.Size = new System.Drawing.Size(195, 25);
+            this.ob_okqty.Size = new System.Drawing.Size(147, 21);
             this.ob_okqty.Str = null;
             this.ob_okqty.Str1 = null;
             this.ob_okqty.Str2 = null;
@@ -495,11 +491,10 @@
             this.oi_checkqty.BackColor = System.Drawing.Color.White;
             this.oi_checkqty.Enabled = false;
             this.oi_checkqty.ID = null;
-            this.oi_checkqty.Location = new System.Drawing.Point(800, 370);
-            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(4);
+            this.oi_checkqty.Location = new System.Drawing.Point(600, 296);
             this.oi_checkqty.Name = "oi_checkqty";
             this.oi_checkqty.Power = null;
-            this.oi_checkqty.Size = new System.Drawing.Size(195, 25);
+            this.oi_checkqty.Size = new System.Drawing.Size(147, 21);
             this.oi_checkqty.Str = null;
             this.oi_checkqty.Str1 = null;
             this.oi_checkqty.Str2 = null;
@@ -512,11 +507,10 @@
             this.ob_ngqty.BackColor = System.Drawing.Color.White;
             this.ob_ngqty.Enabled = false;
             this.ob_ngqty.ID = null;
-            this.ob_ngqty.Location = new System.Drawing.Point(800, 456);
-            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_ngqty.Location = new System.Drawing.Point(600, 365);
             this.ob_ngqty.Name = "ob_ngqty";
             this.ob_ngqty.Power = null;
-            this.ob_ngqty.Size = new System.Drawing.Size(195, 25);
+            this.ob_ngqty.Size = new System.Drawing.Size(147, 21);
             this.ob_ngqty.Str = null;
             this.ob_ngqty.Str1 = null;
             this.ob_ngqty.Str2 = null;
@@ -529,11 +523,10 @@
             this.ob_result.BackColor = System.Drawing.Color.White;
             this.ob_result.Enabled = false;
             this.ob_result.ID = null;
-            this.ob_result.Location = new System.Drawing.Point(800, 288);
-            this.ob_result.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_result.Location = new System.Drawing.Point(600, 230);
             this.ob_result.Name = "ob_result";
             this.ob_result.Power = null;
-            this.ob_result.Size = new System.Drawing.Size(195, 25);
+            this.ob_result.Size = new System.Drawing.Size(147, 21);
             this.ob_result.Str = null;
             this.ob_result.Str1 = null;
             this.ob_result.Str2 = null;
@@ -546,11 +539,10 @@
             this.ob_aqlcode.BackColor = System.Drawing.Color.White;
             this.ob_aqlcode.Enabled = false;
             this.ob_aqlcode.ID = null;
-            this.ob_aqlcode.Location = new System.Drawing.Point(800, 498);
-            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_aqlcode.Location = new System.Drawing.Point(600, 398);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
-            this.ob_aqlcode.Size = new System.Drawing.Size(195, 25);
+            this.ob_aqlcode.Size = new System.Drawing.Size(147, 21);
             this.ob_aqlcode.Str = null;
             this.ob_aqlcode.Str1 = null;
             this.ob_aqlcode.Str2 = null;
@@ -565,13 +557,12 @@
             this.WithdrawPass.Enabled = false;
             this.WithdrawPass.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.Image")));
             this.WithdrawPass.IsShowBorder = true;
-            this.WithdrawPass.Location = new System.Drawing.Point(580, 606);
-            this.WithdrawPass.Margin = new System.Windows.Forms.Padding(4);
+            this.WithdrawPass.Location = new System.Drawing.Point(435, 485);
             this.WithdrawPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.MoveImage")));
             this.WithdrawPass.Name = "WithdrawPass";
             this.WithdrawPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.NormalImage")));
             this.WithdrawPass.Power = "IFREAD";
-            this.WithdrawPass.Size = new System.Drawing.Size(91, 38);
+            this.WithdrawPass.Size = new System.Drawing.Size(68, 30);
             this.WithdrawPass.TabIndex = 167;
             this.WithdrawPass.Text = "撤销通过";
             this.WithdrawPass.UseVisualStyleBackColor = true;
@@ -585,13 +576,12 @@
             this.BatchRejection.Enabled = false;
             this.BatchRejection.Image = ((System.Drawing.Image)(resources.GetObject("BatchRejection.Image")));
             this.BatchRejection.IsShowBorder = true;
-            this.BatchRejection.Location = new System.Drawing.Point(41, 658);
-            this.BatchRejection.Margin = new System.Windows.Forms.Padding(4);
+            this.BatchRejection.Location = new System.Drawing.Point(31, 526);
             this.BatchRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.MoveImage")));
             this.BatchRejection.Name = "BatchRejection";
             this.BatchRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.NormalImage")));
             this.BatchRejection.Power = "IFREAD";
-            this.BatchRejection.Size = new System.Drawing.Size(91, 38);
+            this.BatchRejection.Size = new System.Drawing.Size(68, 30);
             this.BatchRejection.TabIndex = 166;
             this.BatchRejection.Text = "批判退";
             this.BatchRejection.UseVisualStyleBackColor = true;
@@ -605,13 +595,12 @@
             this.ForcePass.Enabled = false;
             this.ForcePass.Image = ((System.Drawing.Image)(resources.GetObject("ForcePass.Image")));
             this.ForcePass.IsShowBorder = true;
-            this.ForcePass.Location = new System.Drawing.Point(393, 606);
-            this.ForcePass.Margin = new System.Windows.Forms.Padding(4);
+            this.ForcePass.Location = new System.Drawing.Point(295, 485);
             this.ForcePass.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.MoveImage")));
             this.ForcePass.Name = "ForcePass";
             this.ForcePass.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.NormalImage")));
             this.ForcePass.Power = "ifspecial";
-            this.ForcePass.Size = new System.Drawing.Size(91, 38);
+            this.ForcePass.Size = new System.Drawing.Size(68, 30);
             this.ForcePass.TabIndex = 165;
             this.ForcePass.Text = "强制通过";
             this.ForcePass.UseVisualStyleBackColor = true;
@@ -625,13 +614,12 @@
             this.ForceRejection.Enabled = false;
             this.ForceRejection.Image = ((System.Drawing.Image)(resources.GetObject("ForceRejection.Image")));
             this.ForceRejection.IsShowBorder = true;
-            this.ForceRejection.Location = new System.Drawing.Point(393, 658);
-            this.ForceRejection.Margin = new System.Windows.Forms.Padding(4);
+            this.ForceRejection.Location = new System.Drawing.Point(295, 526);
             this.ForceRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.MoveImage")));
             this.ForceRejection.Name = "ForceRejection";
             this.ForceRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.NormalImage")));
             this.ForceRejection.Power = "ifspecial";
-            this.ForceRejection.Size = new System.Drawing.Size(91, 38);
+            this.ForceRejection.Size = new System.Drawing.Size(68, 30);
             this.ForceRejection.TabIndex = 164;
             this.ForceRejection.Text = "强制批退";
             this.ForceRejection.UseVisualStyleBackColor = true;
@@ -645,13 +633,12 @@
             this.WithdrawRejection.Enabled = false;
             this.WithdrawRejection.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.Image")));
             this.WithdrawRejection.IsShowBorder = true;
-            this.WithdrawRejection.Location = new System.Drawing.Point(580, 658);
-            this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(4);
+            this.WithdrawRejection.Location = new System.Drawing.Point(435, 526);
             this.WithdrawRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.MoveImage")));
             this.WithdrawRejection.Name = "WithdrawRejection";
             this.WithdrawRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.NormalImage")));
             this.WithdrawRejection.Power = "IFREAD";
-            this.WithdrawRejection.Size = new System.Drawing.Size(91, 38);
+            this.WithdrawRejection.Size = new System.Drawing.Size(68, 30);
             this.WithdrawRejection.TabIndex = 163;
             this.WithdrawRejection.Text = "撤销判退";
             this.WithdrawRejection.UseVisualStyleBackColor = true;
@@ -665,13 +652,12 @@
             this.BatchPass.Enabled = false;
             this.BatchPass.Image = ((System.Drawing.Image)(resources.GetObject("BatchPass.Image")));
             this.BatchPass.IsShowBorder = true;
-            this.BatchPass.Location = new System.Drawing.Point(41, 605);
-            this.BatchPass.Margin = new System.Windows.Forms.Padding(4);
+            this.BatchPass.Location = new System.Drawing.Point(31, 484);
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
             this.BatchPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.NormalImage")));
             this.BatchPass.Power = "IFREAD";
-            this.BatchPass.Size = new System.Drawing.Size(91, 38);
+            this.BatchPass.Size = new System.Drawing.Size(68, 30);
             this.BatchPass.TabIndex = 162;
             this.BatchPass.Text = "批判过";
             this.BatchPass.UseVisualStyleBackColor = true;
@@ -684,39 +670,196 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1113, 642);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4);
+            this.Clean.Location = new System.Drawing.Point(835, 514);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(85, 36);
+            this.Clean.Size = new System.Drawing.Size(64, 29);
             this.Clean.TabIndex = 159;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
-            // ob_maxngacceptqty
-            // 
-            this.ob_maxngacceptqty.AllPower = "";
-            this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
-            this.ob_maxngacceptqty.ID = null;
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(268, 534);
-            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
-            this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
-            this.ob_maxngacceptqty.Power = "";
-            this.ob_maxngacceptqty.Size = new System.Drawing.Size(257, 25);
-            this.ob_maxngacceptqty.Str = null;
-            this.ob_maxngacceptqty.Str1 = null;
-            this.ob_maxngacceptqty.Str2 = null;
-            this.ob_maxngacceptqty.TabIndex = 233;
-            this.ob_maxngacceptqty.Tag = "NoAuto";
+            // 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(823, 122);
+            this.ob_miacceptqty.Name = "ob_miacceptqty";
+            this.ob_miacceptqty.Power = null;
+            this.ob_miacceptqty.Size = new System.Drawing.Size(146, 21);
+            this.ob_miacceptqty.Str = null;
+            this.ob_miacceptqty.Str1 = null;
+            this.ob_miacceptqty.Str2 = null;
+            this.ob_miacceptqty.TabIndex = 239;
+            this.ob_miacceptqty.Tag = "ob_miacceptqty";
+            // 
+            // label7
+            // 
+            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(700, 122);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(111, 21);
+            this.label7.TabIndex = 238;
+            this.label7.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(823, 95);
+            this.ob_maacceptqty.Name = "ob_maacceptqty";
+            this.ob_maacceptqty.Power = null;
+            this.ob_maacceptqty.Size = new System.Drawing.Size(146, 21);
+            this.ob_maacceptqty.Str = null;
+            this.ob_maacceptqty.Str1 = null;
+            this.ob_maacceptqty.Str2 = null;
+            this.ob_maacceptqty.TabIndex = 237;
+            this.ob_maacceptqty.Tag = "ob_maacceptqty";
+            // 
+            // label6
+            // 
+            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.Location = new System.Drawing.Point(700, 95);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(117, 21);
+            this.label6.TabIndex = 236;
+            this.label6.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(823, 65);
+            this.ob_cracceptqty.Name = "ob_cracceptqty";
+            this.ob_cracceptqty.Power = null;
+            this.ob_cracceptqty.Size = new System.Drawing.Size(146, 21);
+            this.ob_cracceptqty.Str = null;
+            this.ob_cracceptqty.Str1 = null;
+            this.ob_cracceptqty.Str2 = null;
+            this.ob_cracceptqty.TabIndex = 235;
+            this.ob_cracceptqty.Tag = "ob_cracceptqty";
+            // 
+            // label2
+            // 
+            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(700, 65);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(111, 21);
+            this.label2.TabIndex = 234;
+            this.label2.Text = "最大CR通过数";
+            // 
+            // ob_miqty
+            // 
+            this.ob_miqty.AllPower = null;
+            this.ob_miqty.BackColor = System.Drawing.Color.White;
+            this.ob_miqty.ID = null;
+            this.ob_miqty.Location = new System.Drawing.Point(621, 126);
+            this.ob_miqty.Name = "ob_miqty";
+            this.ob_miqty.Power = null;
+            this.ob_miqty.Size = new System.Drawing.Size(73, 21);
+            this.ob_miqty.Str = null;
+            this.ob_miqty.Str1 = null;
+            this.ob_miqty.Str2 = null;
+            this.ob_miqty.TabIndex = 245;
+            this.ob_miqty.Tag = "ob_miqty";
+            // 
+            // label11
+            // 
+            this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label11.Location = new System.Drawing.Point(559, 126);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(47, 21);
+            this.label11.TabIndex = 244;
+            this.label11.Text = "MI数";
+            // 
+            // ob_maqty
+            // 
+            this.ob_maqty.AllPower = null;
+            this.ob_maqty.BackColor = System.Drawing.Color.White;
+            this.ob_maqty.ID = null;
+            this.ob_maqty.Location = new System.Drawing.Point(621, 95);
+            this.ob_maqty.Name = "ob_maqty";
+            this.ob_maqty.Power = null;
+            this.ob_maqty.Size = new System.Drawing.Size(73, 21);
+            this.ob_maqty.Str = null;
+            this.ob_maqty.Str1 = null;
+            this.ob_maqty.Str2 = null;
+            this.ob_maqty.TabIndex = 243;
+            this.ob_maqty.Tag = "ob_maqty";
+            // 
+            // label10
+            // 
+            this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label10.AutoSize = true;
+            this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label10.Location = new System.Drawing.Point(559, 95);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(53, 21);
+            this.label10.TabIndex = 242;
+            this.label10.Text = "MA数";
+            // 
+            // ob_crqty
+            // 
+            this.ob_crqty.AllPower = null;
+            this.ob_crqty.BackColor = System.Drawing.Color.White;
+            this.ob_crqty.ID = null;
+            this.ob_crqty.Location = new System.Drawing.Point(621, 65);
+            this.ob_crqty.Name = "ob_crqty";
+            this.ob_crqty.Power = null;
+            this.ob_crqty.Size = new System.Drawing.Size(73, 21);
+            this.ob_crqty.Str = null;
+            this.ob_crqty.Str1 = null;
+            this.ob_crqty.Str2 = null;
+            this.ob_crqty.TabIndex = 241;
+            this.ob_crqty.Tag = "ob_crqty";
+            // 
+            // label8
+            // 
+            this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(559, 65);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(47, 21);
+            this.label8.TabIndex = 240;
+            this.label8.Text = "CR数";
             // 
             // OQC_BatchResultJudge
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1300, 706);
+            this.ClientSize = new System.Drawing.Size(975, 565);
+            this.Controls.Add(this.ob_miqty);
+            this.Controls.Add(this.label11);
+            this.Controls.Add(this.ob_maqty);
+            this.Controls.Add(this.label10);
+            this.Controls.Add(this.ob_crqty);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.ob_miacceptqty);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.ob_maacceptqty);
+            this.Controls.Add(this.label6);
+            this.Controls.Add(this.ob_cracceptqty);
+            this.Controls.Add(this.label2);
             this.Controls.Add(this.ob_maxngacceptqty);
             this.Controls.Add(this.ob_status_label);
             this.Controls.Add(this.ob_status);
@@ -760,7 +903,6 @@
             this.Controls.Add(this.ob_ngqty_label);
             this.Controls.Add(this.oi_checkqty_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OQC_BatchResultJudge";
             this.Tag = "OQC!BatchResultJudge";
             this.Text = "抽检批维护";
@@ -818,5 +960,17 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_status;
         private System.Windows.Forms.Label ob_status_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_maxngacceptqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_miacceptqty;
+        private System.Windows.Forms.Label label7;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_maacceptqty;
+        private System.Windows.Forms.Label label6;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_cracceptqty;
+        private System.Windows.Forms.Label label2;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_miqty;
+        private System.Windows.Forms.Label label11;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_maqty;
+        private System.Windows.Forms.Label label10;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_crqty;
+        private System.Windows.Forms.Label label8;
     }
 }

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -124,18 +124,28 @@ namespace UAS_MES.OQC
             string ReworkCode = "";
             if (CheckBefore() && PassCheckStep)
             {
-                if (int.Parse(ob_ngqty.Text == "" ? "0" : ob_ngqty.Text) <= int.Parse(ob_maxngacceptqty.Text == "" ? ob_maxngacceptqty.Text : ob_maxngacceptqty.Text))
+                if (int.Parse(ob_crqty.Text) > int.Parse(ob_cracceptqty.Text))
                 {
-                    if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "OK", "", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
+                    OperateResult.AppendText(">>当前批次CR不合格数为" + ob_ngqty.Text + ",大于最大CR通过数" + ob_cracceptqty.Text + "\n", Color.Red);
+                    return;
+                }
+                if (int.Parse(ob_maqty.Text) > int.Parse(ob_maacceptqty.Text))
+                {
+                    OperateResult.AppendText(">>当前批次MA不合格数为" + ob_maqty.Text + ",大于最大MA通过数" + ob_maacceptqty.Text + "\n", Color.Red);
+                    return;
+                }
+                if (int.Parse(ob_miqty.Text) > int.Parse(ob_miacceptqty.Text))
+                {
+                    OperateResult.AppendText(">>当前批次MI不合格数为" + ob_miqty.Text + ",大于最大MI通过数" + ob_miacceptqty.Text + "\n", Color.Red);
+                    return;
+                }
+                if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "OK", "", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
                     {
                         LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,"",User.UserLineCode,User.UserSourceCode,"通过批", "抽检批: "+ ob_checkno.Text+"通过","",ob_checkno.Text);
                         OperateResult.AppendText(">>通过批成功\n", Color.Green);
                         GetBatch.PerformClick();
                     }
                     else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                }
-                else
-                    OperateResult.AppendText(">>当前批次不合格数为" + ob_ngqty.Text + ",大于最大不合格允通过数" + ob_maxngacceptqty.Text + "\n", Color.Red);
             }
         }
 
@@ -271,34 +281,35 @@ namespace UAS_MES.OQC
         /// <returns></returns>
         private bool CheckBefore()
         {
-            if (ob_status.Text == "检验中")
-            {
-                if (ob_maxngacceptqty.Text == "")
-                {
-                    if (ob_aqlcode.Text == "")
-                        OperateResult.AppendText(">>AQL标准为空的时候必须填写最大不合格允许通过数\n", Color.Red);
-                    else
-                    {
-                        sql.Clear();
-                        sql.Append("select nvl(ad_minqty,0)ad_minqty,nvl(ad_maxqty,0)ad_maxqty,nvl(ad_maxngacceptqty,0) ");
-                        sql.Append("ad_maxngacceptqty from QUA_Aql left join qua_aqldetail on ad_alid=al_id where ");
-                        sql.Append("al_code='" + ob_aqlcode.Text + "' and ad_minqty<='" + ob_nowcheckqty.Text + "' and ad_maxqty>='" + ob_nowcheckqty.Text + "'");
-                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            ob_maxngacceptqty.Text = dt.Rows[0]["ad_maxngacceptqty"].ToString();
-                            return true;
-                        }
-                    }
-                }
-                else
-                {
-                    return true;
-                }
-            }
-            else OperateResult.AppendText(">>状态未在检验中的批次不允许进行判断\n", Color.Red);
+            //if (ob_status.Text == "检验中")
+            //{
+            //    if (ob_maxngacceptqty.Text == "")
+            //    {
+            //        if (ob_aqlcode.Text == "")
+            //            OperateResult.AppendText(">>AQL标准为空的时候必须填写最大不合格允许通过数\n", Color.Red);
+            //        else
+            //        {
+            //            sql.Clear();
+            //            sql.Append("select nvl(ad_minqty,0)ad_minqty,nvl(ad_maxqty,0)ad_maxqty,nvl(ad_maxngacceptqty,0) ");
+            //            sql.Append("ad_maxngacceptqty from QUA_Aql left join qua_aqldetail on ad_alid=al_id where ");
+            //            sql.Append("al_code='" + ob_aqlcode.Text + "' and ad_minqty<='" + ob_nowcheckqty.Text + "' and ad_maxqty>='" + ob_nowcheckqty.Text + "'");
+            //            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            //            if (dt.Rows.Count > 0)
+            //            {
+            //                ob_maxngacceptqty.Text = dt.Rows[0]["ad_maxngacceptqty"].ToString();
+            //                return true;
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        return true;
+            //    }
+            //}
+            //else OperateResult.AppendText(">>状态未在检验中的批次不允许进行判断\n", Color.Red);
 
-            return false;
+            //return false;
+            return true;
         }
 
         private bool CheckStep()

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -84,6 +84,9 @@ namespace UAS_MES.OQC
                     {
                         ob_sampleqty.Text = "";
                         ob_maxngacceptqty.Text = "";
+                        ob_cracceptqty.Text = "";
+                        ob_maacceptqty.Text = "";
+                        ob_miacceptqty.Text = "";
                         BaseUtil.SetFormValue(Controls, dt[0]);
                         BaseUtil.FillDgvWithDataTable(CheckTypeDGV, dt[1]);
                         al_code.Text = "";
@@ -201,6 +204,11 @@ namespace UAS_MES.OQC
         {
             if (al_code.Text != "" || ob_maxngacceptqty.Text != "")
             {
+                if (ob_cracceptqty.Text == "" || ob_maacceptqty.Text == "" || ob_miacceptqty.Text == "")
+                {
+                    OperateResult.AppendText(">>CR,MA,MI三个数据均不可为空\n", Color.Red);
+                    return;
+                }
                 if (dh.getFieldDataByCondition("oqcbatch", "ob_status", "ob_checkno='" + ob_checkno.Text + "'").ToString() == "UNCHECK")
                 {
                     if (Checkob_maxngacceptqty())
@@ -216,14 +224,12 @@ namespace UAS_MES.OQC
         //对于最大不合格允通过数的校验
         private bool Checkob_maxngacceptqty()
         {
-            if (int.Parse(ob_maxngacceptqty.Text == "" ? "0" : ob_maxngacceptqty.Text) < 0)
-            {
-                OperateResult.AppendText(">>最大不合格允通过数必须大于等于0\n", Color.Red);
-                ob_maxngacceptqty.Text = null;
-                return false;
-            }
-            else
-            {
+            //if (int.Parse(ob_maxngacceptqty.Text == "" ? "0" : ob_maxngacceptqty.Text) < 0)
+            //{
+            //    OperateResult.AppendText(">>最大不合格允通过数必须大于等于0\n", Color.Red);
+            //    ob_maxngacceptqty.Text = null;
+            //    return false;
+            //}
                 if (ob_maxngacceptqty.Text == "")
                 {
                     ob_maxngacceptqty.Text = dh.getFieldDataByCondition("QUA_Aql left join qua_aqldetail on ad_alid=al_id", "nvl(ad_maxngacceptqty,0)", "al_code='" + al_code.Text + "' and ad_minqty<='" + ob_nowcheckqty.Text + "' and ad_maxqty>='" + ob_nowcheckqty.Text + "'").ToString();
@@ -233,9 +239,8 @@ namespace UAS_MES.OQC
                     OperateResult.AppendText(">>最大不合格通过数不允许大于抽检数\n", Color.Red);
                     return false;
                 }
-                int result = (int)dh.ExecuteSql("update OQCBatch set ob_projectcode='" + pr_code.Text + "',ob_remark = '" + ob_remark.Text + "',ob_aqlcode='" + al_code.Text + "',ob_maxngacceptqty='" + ob_maxngacceptqty.Text + "',ob_actsampleqty='" + ob_sampleqty.Text + "' where ob_checkno='" + ob_checkno.Text + "' ", "update");
+                int result = (int)dh.ExecuteSql("update OQCBatch set ob_projectcode='" + pr_code.Text + "',ob_remark = '" + ob_remark.Text + "',ob_aqlcode='" + al_code.Text + "',ob_maxngacceptqty='" + ob_maxngacceptqty.Text + "',ob_actsampleqty='" + ob_sampleqty.Text + "',ob_cracceptqty= '"+ ob_cracceptqty.Text+ "',ob_maacceptqty= '" + ob_maacceptqty.Text + "',ob_miacceptqty= '" + ob_miacceptqty.Text + "' where ob_checkno='" + ob_checkno.Text + "' ", "update");
                 return result > 0;
-            }
         }
 
         private void Clean_Click(object sender, EventArgs e)

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

@@ -68,6 +68,12 @@
             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();
@@ -77,10 +83,9 @@
             // 
             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(689, 61);
-            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_sncode_label.Location = new System.Drawing.Point(517, 49);
             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(58, 21);
             this.ms_sncode_label.TabIndex = 152;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -88,10 +93,9 @@
             // 
             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(28, 56);
-            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_checkno_label.Location = new System.Drawing.Point(21, 45);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
             this.ob_checkno_label.TabIndex = 154;
             this.ob_checkno_label.Text = "批次号";
             // 
@@ -102,9 +106,8 @@
             this.panel2.Controls.Add(this.label2);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1363, 36);
+            this.panel2.Size = new System.Drawing.Size(1022, 29);
             this.panel2.TabIndex = 156;
             this.panel2.Tag = "NoAuto";
             // 
@@ -113,10 +116,9 @@
             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.SystemColors.ActiveCaptionText;
-            this.label2.Location = new System.Drawing.Point(16, 5);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(12, 4);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(177, 27);
+            this.label2.Size = new System.Drawing.Size(143, 21);
             this.label2.TabIndex = 0;
             this.label2.Text = "OQC采样计划维护";
             // 
@@ -124,10 +126,9 @@
             // 
             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(352, 59);
-            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(264, 47);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
             this.obd_outboxcode_label.TabIndex = 157;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -135,10 +136,9 @@
             // 
             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(692, 110);
-            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(519, 88);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(58, 21);
             this.ob_batchqty_label.TabIndex = 159;
             this.ob_batchqty_label.Text = "批数量";
             // 
@@ -146,10 +146,9 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(28, 110);
-            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(21, 88);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.ob_prodcode_label.TabIndex = 163;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -157,10 +156,9 @@
             // 
             this.ob_remark_label.AutoSize = true;
             this.ob_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_remark_label.Location = new System.Drawing.Point(389, 74);
-            this.ob_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_remark_label.Location = new System.Drawing.Point(507, 70);
             this.ob_remark_label.Name = "ob_remark_label";
-            this.ob_remark_label.Size = new System.Drawing.Size(52, 27);
+            this.ob_remark_label.Size = new System.Drawing.Size(42, 21);
             this.ob_remark_label.TabIndex = 172;
             this.ob_remark_label.Text = "备注";
             // 
@@ -168,10 +166,9 @@
             // 
             this.ob_maxacceptqty_label.AutoSize = true;
             this.ob_maxacceptqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_maxacceptqty_label.Location = new System.Drawing.Point(389, 22);
-            this.ob_maxacceptqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_maxacceptqty_label.Location = new System.Drawing.Point(292, 9);
             this.ob_maxacceptqty_label.Name = "ob_maxacceptqty_label";
-            this.ob_maxacceptqty_label.Size = new System.Drawing.Size(212, 27);
+            this.ob_maxacceptqty_label.Size = new System.Drawing.Size(170, 21);
             this.ob_maxacceptqty_label.TabIndex = 182;
             this.ob_maxacceptqty_label.Text = "最大不合格允许通过数";
             // 
@@ -179,10 +176,9 @@
             // 
             this.ob_aqlcode_label.AutoSize = true;
             this.ob_aqlcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_aqlcode_label.Location = new System.Drawing.Point(16, 22);
-            this.ob_aqlcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_aqlcode_label.Location = new System.Drawing.Point(12, 9);
             this.ob_aqlcode_label.Name = "ob_aqlcode_label";
-            this.ob_aqlcode_label.Size = new System.Drawing.Size(52, 27);
+            this.ob_aqlcode_label.Size = new System.Drawing.Size(42, 21);
             this.ob_aqlcode_label.TabIndex = 184;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -190,10 +186,9 @@
             // 
             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(1019, 110);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(764, 88);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 27);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 186;
             this.label1.Text = "检验方案";
             // 
@@ -201,15 +196,22 @@
             // 
             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(352, 110);
+            this.pr_detail_label.Location = new System.Drawing.Point(264, 88);
+            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(92, 27);
+            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
             this.pr_detail_label.TabIndex = 188;
             this.pr_detail_label.Text = "产品名称";
             // 
             // panel1
             // 
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Controls.Add(this.ob_miacceptqty);
+            this.panel1.Controls.Add(this.label5);
+            this.panel1.Controls.Add(this.ob_maacceptqty);
+            this.panel1.Controls.Add(this.label4);
+            this.panel1.Controls.Add(this.ob_cracceptqty);
+            this.panel1.Controls.Add(this.label3);
             this.panel1.Controls.Add(this.ob_maxngacceptqty);
             this.panel1.Controls.Add(this.ob_sampleqty);
             this.panel1.Controls.Add(this.ob_sampleqty_label);
@@ -218,10 +220,9 @@
             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(33, 158);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4);
+            this.panel1.Location = new System.Drawing.Point(25, 126);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(993, 120);
+            this.panel1.Size = new System.Drawing.Size(745, 96);
             this.panel1.TabIndex = 193;
             // 
             // ob_maxngacceptqty
@@ -229,11 +230,10 @@
             this.ob_maxngacceptqty.AllPower = null;
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.ID = null;
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(629, 22);
-            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(472, 9);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = null;
-            this.ob_maxngacceptqty.Size = new System.Drawing.Size(224, 25);
+            this.ob_maxngacceptqty.Size = new System.Drawing.Size(169, 21);
             this.ob_maxngacceptqty.Str = null;
             this.ob_maxngacceptqty.Str1 = null;
             this.ob_maxngacceptqty.Str2 = null;
@@ -242,10 +242,9 @@
             // 
             // ob_sampleqty
             // 
-            this.ob_sampleqty.Location = new System.Drawing.Point(118, 74);
-            this.ob_sampleqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_sampleqty.Location = new System.Drawing.Point(88, 68);
             this.ob_sampleqty.Name = "ob_sampleqty";
-            this.ob_sampleqty.Size = new System.Drawing.Size(204, 25);
+            this.ob_sampleqty.Size = new System.Drawing.Size(154, 21);
             this.ob_sampleqty.TabIndex = 194;
             this.ob_sampleqty.Text = "0";
             this.ob_sampleqty.TextChanged += new System.EventHandler(this.ad_qty_TextChanged_1);
@@ -254,10 +253,9 @@
             // 
             this.ob_sampleqty_label.AutoSize = true;
             this.ob_sampleqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_sampleqty_label.Location = new System.Drawing.Point(16, 74);
-            this.ob_sampleqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_sampleqty_label.Location = new System.Drawing.Point(12, 68);
             this.ob_sampleqty_label.Name = "ob_sampleqty_label";
-            this.ob_sampleqty_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_sampleqty_label.Size = new System.Drawing.Size(58, 21);
             this.ob_sampleqty_label.TabIndex = 193;
             this.ob_sampleqty_label.Text = "样本数";
             // 
@@ -266,11 +264,10 @@
             this.ob_remark.AllPower = null;
             this.ob_remark.BackColor = System.Drawing.Color.White;
             this.ob_remark.ID = null;
-            this.ob_remark.Location = new System.Drawing.Point(629, 74);
-            this.ob_remark.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_remark.Location = new System.Drawing.Point(561, 70);
             this.ob_remark.Name = "ob_remark";
             this.ob_remark.Power = null;
-            this.ob_remark.Size = new System.Drawing.Size(224, 25);
+            this.ob_remark.Size = new System.Drawing.Size(169, 21);
             this.ob_remark.Str = null;
             this.ob_remark.Str1 = null;
             this.ob_remark.Str2 = null;
@@ -284,14 +281,14 @@
             this.al_code.Condition = null;
             this.al_code.DBTitle = null;
             this.al_code.FormName = null;
-            this.al_code.Location = new System.Drawing.Point(119, 25);
-            this.al_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.al_code.Location = new System.Drawing.Point(89, 11);
+            this.al_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.al_code.Name = "al_code";
             this.al_code.Power = null;
             this.al_code.ReturnData = null;
             this.al_code.SelectField = null;
             this.al_code.SetValueField = null;
-            this.al_code.Size = new System.Drawing.Size(226, 26);
+            this.al_code.Size = new System.Drawing.Size(170, 21);
             this.al_code.TabIndex = 191;
             this.al_code.TableName = null;
             this.al_code.Tag = "ob_aqlcode";
@@ -304,12 +301,12 @@
             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(458, 110);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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.Name = "pr_detail";
             this.pr_detail.Power = null;
             this.pr_detail.ReadOnly = true;
-            this.pr_detail.Size = new System.Drawing.Size(180, 25);
+            this.pr_detail.Size = new System.Drawing.Size(136, 21);
             this.pr_detail.Str = null;
             this.pr_detail.Str1 = null;
             this.pr_detail.Str2 = null;
@@ -323,14 +320,14 @@
             this.pr_code.Condition = null;
             this.pr_code.DBTitle = null;
             this.pr_code.FormName = null;
-            this.pr_code.Location = new System.Drawing.Point(1136, 110);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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.Name = "pr_code";
             this.pr_code.Power = null;
             this.pr_code.ReturnData = null;
             this.pr_code.SelectField = null;
             this.pr_code.SetValueField = null;
-            this.pr_code.Size = new System.Drawing.Size(212, 26);
+            this.pr_code.Size = new System.Drawing.Size(159, 21);
             this.pr_code.TabIndex = 187;
             this.pr_code.TableName = null;
             this.pr_code.Tag = "ob_projectcode";
@@ -343,11 +340,10 @@
             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(1167, 159);
-            this.ob_status.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_status.Location = new System.Drawing.Point(875, 127);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
-            this.ob_status.Size = new System.Drawing.Size(180, 25);
+            this.ob_status.Size = new System.Drawing.Size(136, 21);
             this.ob_status.Str = null;
             this.ob_status.Str1 = null;
             this.ob_status.Str2 = null;
@@ -358,10 +354,9 @@
             // 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(1036, 315);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(777, 252);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(309, 396);
+            this.OperateResult.Size = new System.Drawing.Size(233, 318);
             this.OperateResult.TabIndex = 177;
             this.OperateResult.Text = "";
             // 
@@ -373,13 +368,12 @@
             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(1145, 729);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4);
+            this.Clean.Location = new System.Drawing.Point(859, 583);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(91, 30);
+            this.Clean.Size = new System.Drawing.Size(68, 24);
             this.Clean.TabIndex = 176;
             this.Clean.Tag = "";
             this.Clean.Text = "清除";
@@ -394,13 +388,12 @@
             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(1024, 64);
-            this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
+            this.GetBatch.Location = new System.Drawing.Point(768, 51);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifRead";
-            this.GetBatch.Size = new System.Drawing.Size(91, 30);
+            this.GetBatch.Size = new System.Drawing.Size(68, 24);
             this.GetBatch.TabIndex = 171;
             this.GetBatch.Tag = "OQC!Inspection";
             this.GetBatch.Text = "获取批";
@@ -415,13 +408,12 @@
             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(490, 729);
-            this.Save.Margin = new System.Windows.Forms.Padding(4);
+            this.Save.Location = new System.Drawing.Point(368, 583);
             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 = "ifread";
-            this.Save.Size = new System.Drawing.Size(93, 30);
+            this.Save.Size = new System.Drawing.Size(70, 24);
             this.Save.TabIndex = 168;
             this.Save.Tag = "";
             this.Save.Text = "保存";
@@ -439,11 +431,10 @@
             this.ci_kind,
             this.oi_sampleqty});
             this.CheckTypeDGV.EnableContentClick = true;
-            this.CheckTypeDGV.Location = new System.Drawing.Point(33, 315);
-            this.CheckTypeDGV.Margin = new System.Windows.Forms.Padding(4);
+            this.CheckTypeDGV.Location = new System.Drawing.Point(25, 252);
             this.CheckTypeDGV.Name = "CheckTypeDGV";
             this.CheckTypeDGV.RowTemplate.Height = 23;
-            this.CheckTypeDGV.Size = new System.Drawing.Size(993, 398);
+            this.CheckTypeDGV.Size = new System.Drawing.Size(745, 318);
             this.CheckTypeDGV.TabIndex = 167;
             this.CheckTypeDGV.DataSourceChanged += new System.EventHandler(this.CheckTypeDGV_DataSourceChanged);
             // 
@@ -497,11 +488,10 @@
             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(135, 110);
-            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_prodcode.Location = new System.Drawing.Point(101, 88);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
-            this.ob_prodcode.Size = new System.Drawing.Size(180, 25);
+            this.ob_prodcode.Size = new System.Drawing.Size(136, 21);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -514,12 +504,11 @@
             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(795, 110);
-            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(596, 88);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
             this.ob_nowcheckqty.ReadOnly = true;
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(180, 25);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(136, 21);
             this.ob_nowcheckqty.Str = null;
             this.ob_nowcheckqty.Str1 = null;
             this.ob_nowcheckqty.Str2 = null;
@@ -531,11 +520,10 @@
             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(458, 61);
-            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.obd_outboxcode.Location = new System.Drawing.Point(344, 49);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(180, 25);
+            this.obd_outboxcode.Size = new System.Drawing.Size(136, 21);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -548,11 +536,10 @@
             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(135, 59);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_checkno.Location = new System.Drawing.Point(101, 47);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = null;
-            this.ob_checkno.Size = new System.Drawing.Size(180, 25);
+            this.ob_checkno.Size = new System.Drawing.Size(136, 21);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -565,11 +552,10 @@
             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(795, 64);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.ms_sncode.Location = new System.Drawing.Point(596, 51);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(180, 25);
+            this.ms_sncode.Size = new System.Drawing.Size(136, 21);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -579,9 +565,10 @@
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(33, 286);
+            this.ChooseAll.Location = new System.Drawing.Point(25, 229);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(50, 23);
+            this.ChooseAll.Size = new System.Drawing.Size(38, 18);
             this.ChooseAll.TabIndex = 194;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
@@ -590,10 +577,9 @@
             // 
             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(1062, 233);
-            this.ob_reworkcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_reworkcode.Location = new System.Drawing.Point(796, 186);
             this.ob_reworkcode.Name = "ob_reworkcode";
-            this.ob_reworkcode.Size = new System.Drawing.Size(0, 27);
+            this.ob_reworkcode.Size = new System.Drawing.Size(0, 21);
             this.ob_reworkcode.TabIndex = 195;
             this.ob_reworkcode.Visible = false;
             // 
@@ -601,18 +587,92 @@
             // 
             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(1062, 198);
-            this.ob_source.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_source.Location = new System.Drawing.Point(796, 158);
             this.ob_source.Name = "ob_source";
-            this.ob_source.Size = new System.Drawing.Size(0, 27);
+            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(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1363, 781);
+            this.ClientSize = new System.Drawing.Size(1022, 625);
             this.Controls.Add(this.ob_source);
             this.Controls.Add(this.ob_reworkcode);
             this.Controls.Add(this.ChooseAll);
@@ -639,19 +699,18 @@
             this.Controls.Add(this.ms_sncode);
             this.Controls.Add(this.ms_sncode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OQC_PlanMaintain";
             this.Tag = "OQC!PlanMaintain";
             this.Text = "抽样计划维护";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OQC_PlanMaintain_FormClosing);
             this.Load += new System.EventHandler(this.抽样计划维护_Load);
             this.SizeChanged += new System.EventHandler(this.抽样计划维护_SizeChanged);
-            this.panel2.ResumeLayout(true);
+            this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
-            this.panel1.ResumeLayout(true);
+            this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -697,5 +756,11 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn oi_sampleqty;
         private System.Windows.Forms.Label ob_reworkcode;
         private System.Windows.Forms.Label ob_source;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_miacceptqty;
+        private System.Windows.Forms.Label label5;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_maacceptqty;
+        private System.Windows.Forms.Label label4;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_cracceptqty;
+        private System.Windows.Forms.Label label3;
     }
 }

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.resx

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

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -227,6 +227,11 @@ namespace UAS_MES.OQC
                         if (if_ng != "0" && if_ng != "")
                         {
                             IfContainNG = true;
+                            if (Savedt.Rows[i]["oi_leveldefect"].ToString() == "-1")
+                            {
+                                OperateResult.AppendText(">>不良项必须填写缺陷等级\n", Color.Red);
+                                return;
+                            }
                         }
                     }
                     if (!IfContainNG && ChoosedDGV.Rows.Count > 0)
@@ -338,8 +343,12 @@ namespace UAS_MES.OQC
                         sql.Append("select count(1)from (select ois_sncode from OQCITEMSAMPLES where ");
                         sql.Append("ois_checkno = '" + ob_checkno.Text + "' and ois_ifng = 1 group by ois_sncode)");
                         string ngqty = (dh.ExecuteSql(sql.GetString(), "select") as DataTable).Rows[0][0].ToString();
+                        //更新CR,MA以及MI不良
+                        string crqty = dh.getFieldDataByCondition("(select ois_sncode,min(OIS_DEFECTLEVEL) OIS_DEFECTLEVEL from OQCITEMSAMPLES where ois_checkno='" + ob_checkno.Text + "' and nvl(ois_ifng,0)<>0  group by ois_sncode)", "count(1) cn", "OIS_DEFECTLEVEL = 'CR'").ToString();
+                        string maqty = dh.getFieldDataByCondition("(select ois_sncode,min(OIS_DEFECTLEVEL) OIS_DEFECTLEVEL from OQCITEMSAMPLES where ois_checkno='" + ob_checkno.Text + "' and nvl(ois_ifng,0)<>0  group by ois_sncode)", "count(1) cn", "OIS_DEFECTLEVEL = 'MA'").ToString();
+                        string miqty = dh.getFieldDataByCondition("(select ois_sncode,min(OIS_DEFECTLEVEL) OIS_DEFECTLEVEL from OQCITEMSAMPLES where ois_checkno='" + ob_checkno.Text + "' and nvl(ois_ifng,0)<>0  group by ois_sncode)", "count(1) cn", "OIS_DEFECTLEVEL = 'MI'").ToString();
                         string checkqty = dh.getFieldDataByCondition("OQCItems", "max(oi_checkqty)", "oi_checkno ='" + ob_checkno.Text + "'").ToString();
-                        dh.ExecuteSql("update OQCBATCH set ob_ngqty='" + ngqty + "',ob_actsampleqty='" + checkqty + "',ob_okqty=('" + checkqty + "'-'" + ngqty + "') where ob_checkno ='" + ob_checkno.Text + "'", "update");
+                        dh.ExecuteSql("update OQCBATCH set ob_ngqty='" + ngqty + "',ob_crqty='" + crqty + "',ob_maqty='" + maqty + "',ob_miqty='" + miqty + "',ob_actsampleqty='" + checkqty + "',ob_okqty=('" + checkqty + "'-'" + ngqty + "') where ob_checkno ='" + ob_checkno.Text + "'", "update");
                         OperateResult.AppendText(">>序列号 " + sncode.Text + "操作成功\n", Color.Green);
                         LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, "", User.UserLineCode, User.UserSourceCode, "抽样数据采集", "检验项目采集成功", sncode.Text, ob_checkno.Text);
                         dh.ExecuteSql("update oqcbatchdetail set obd_ifcheck = '-1' where obd_checkno='" + ob_checkno.Text + "' and obd_sncode='" + sncode.Text + "'", "update");
@@ -359,22 +368,30 @@ namespace UAS_MES.OQC
 
         private void BatchPass_Click(object sender, EventArgs e)
         {
-            if (CheckBefore())
+            if (int.Parse(ob_crqty.Text ) > int.Parse(ob_cracceptqty.Text))
             {
-                if (int.Parse(ob_ngqty.Text == "" ? "0" : ob_ngqty.Text) <= int.Parse(ob_maxngacceptqty.Text == "" ? ob_maxngacceptqty.Text : ob_maxngacceptqty.Text))
-                {
-                    string ReworkCode = "";
-                    if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "OK", "", User.UserCode, ob_remark.Text, out ReworkCode, out ErrorMessage))
-                    {
-                        GetBatch.PerformClick();
-                        BatchPass.Enabled = false;
-                        OperateResult.AppendText(">>" + ob_checkno.Text + "通过批成功\n", Color.Green);
-                        //记录操作日志
-                    }
-                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                }
-                else OperateResult.AppendText(">>当前批次不合格数为" + ob_ngqty.Text + ",大于最大不合格允通过数" + ob_maxngacceptqty.Text + "\n", Color.Red);
+                OperateResult.AppendText(">>当前批次CR不合格数为" + ob_ngqty.Text + ",大于最大CR通过数" + ob_cracceptqty.Text + "\n", Color.Red);
+                return;
+            }
+            if (int.Parse(ob_maqty.Text ) > int.Parse(ob_maacceptqty.Text))
+            {
+                OperateResult.AppendText(">>当前批次MA不合格数为" + ob_maqty.Text + ",大于最大MA通过数" + ob_maacceptqty.Text + "\n", Color.Red);
+                return;
+            }
+            if (int.Parse(ob_miqty.Text ) > int.Parse(ob_miacceptqty.Text))
+            {
+                OperateResult.AppendText(">>当前批次MI不合格数为" + ob_miqty.Text + ",大于最大MI通过数" + ob_miacceptqty.Text + "\n", Color.Red);
+                return;
+            }
+            string ReworkCode = "";
+            if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "OK", "", User.UserCode, ob_remark.Text, out ReworkCode, out ErrorMessage))
+            {
+                GetBatch.PerformClick();
+                BatchPass.Enabled = false;
+                OperateResult.AppendText(">>" + ob_checkno.Text + "通过批成功\n", Color.Green);
+                //记录操作日志
             }
+            else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
         }
 
         private bool CheckBefore()

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="BadInfoSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Clean.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -309,33 +312,6 @@
   <metadata name="ois_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="oi_itemcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ci_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="oi_checkqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="oi_ng.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="oi_leveldefect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ois_remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ois_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="ChooseedReject.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACUAAAAXCAYAAACMLIalAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -782,22 +758,4 @@
   <metadata name="obd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="BadInfoSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="ChooseAll.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bc_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bc_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

UAS-MES/PublicMethod/LogicHandler.cs

@@ -372,7 +372,7 @@ namespace UAS_MES.PublicMethod
                     break;
                 case "OQCPLANMAINTAIN":
                     sql.Clear();
-                    sql.Append("select ob_reworkcode,ob_prodcode,ob_maxngacceptqty,ob_id,ob_checkno,ob_projectcode,ob_nowcheckqty,ob_source,ob_remark,");
+                    sql.Append("select ob_reworkcode,ob_prodcode,ob_maxngacceptqty,ob_cracceptqty,ob_maacceptqty,ob_miacceptqty,ob_id,ob_checkno,ob_projectcode,ob_nowcheckqty,ob_source,ob_remark,");
                     sql.Append("ob_status,pr_id,pr_detail,pr_kind,pr_manutype,pr_qualmethod,nvl(ob_aqlcode,pr_aql)ob_aqlcode from OQCBatch left join product on ");
                     sql.Append("pr_code=ob_prodcode where ob_checkno='" + iCheckNo + "'");
                     Form = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
@@ -414,7 +414,7 @@ namespace UAS_MES.PublicMethod
                 case "OQCDATACOLLECTION":
                     sql.Clear();
                     sql.Append("select ob_checkno,ob_makecode,ob_prodcode,ob_nowcheckqty,pr_detail,ob_ngqty,ob_okqty,");
-                    sql.Append("ob_remark,ob_makecode,ob_status,ob_projectcode,ob_aqlcode,ob_maxngacceptqty from OQCBatch left join product on ");
+                    sql.Append("ob_remark,ob_makecode,ob_status,ob_projectcode,ob_aqlcode,ob_maxngacceptqty,ob_cracceptqty,ob_maacceptqty,ob_miacceptqty,nvl(ob_crqty,0)ob_crqty,nvl(ob_maqty,0)ob_maqty,nvl(ob_miqty,0)ob_miqty from OQCBatch left join product on ");
                     sql.Append("pr_code=ob_prodcode left join oqcitems on oi_checkno =ob_checkno and oi_projectcode =ob_projectcode where ob_checkno='" + iCheckNo + "'");
                     Form = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     //状态为UNCHECK或者CHECKING并且有抽样计划的才能操作
@@ -431,7 +431,7 @@ namespace UAS_MES.PublicMethod
                 case "OQCRESULTDETERMINE":
                     sql.Clear();
                     sql.Append("select ob_id,ob_aqlcode,ob_makecode,ob_status,ob_prodcode,(select max(oi_checkqty)from OQCItems where oi_checkno='" + iCheckNo + "') oi_checkqty,");
-                    sql.Append("ob_nowcheckqty,nvl(ob_okqty,0) ob_okqty,nvl(ob_ngqty,0) ob_ngqty,ob_maxngacceptqty,ob_source,ob_checkno,ob_result from OQCBatch where ob_checkno='" + iCheckNo + "'");
+                    sql.Append("ob_nowcheckqty,nvl(ob_okqty,0) ob_okqty,nvl(ob_ngqty,0) ob_ngqty,ob_maxngacceptqty,ob_source,ob_checkno,ob_result,ob_cracceptqty,ob_maacceptqty,ob_miacceptqty,nvl(ob_crqty,0)ob_crqty,nvl(ob_maqty,0)ob_maqty,nvl(ob_miqty,0)ob_miqty from OQCBatch where ob_checkno='" + iCheckNo + "'");
                     Form = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     if (Form.Rows.Count == 0)
                     {