批结果判断限定批次状态

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

@@ -47,6 +47,7 @@
             this.ob_maxngacceptqty_label = new System.Windows.Forms.Label();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.label5 = new System.Windows.Forms.Label();
+            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_id = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -70,6 +71,7 @@
             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_status_label = new System.Windows.Forms.Label();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -77,9 +79,10 @@
             // 
             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(510, 231);
+            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.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(72, 27);
             this.ob_batchqty_label.TabIndex = 158;
             this.ob_batchqty_label.Text = "实批数";
             // 
@@ -87,9 +90,10 @@
             // 
             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(510, 190);
+            this.ob_result_label.Location = new System.Drawing.Point(680, 287);
+            this.ob_result_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_result_label.Name = "ob_result_label";
-            this.ob_result_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_result_label.Size = new System.Drawing.Size(92, 27);
             this.ob_result_label.TabIndex = 166;
             this.ob_result_label.Text = "判定结果";
             // 
@@ -97,9 +101,10 @@
             // 
             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(510, 316);
+            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.Name = "ob_okqty_label";
-            this.ob_okqty_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_okqty_label.Size = new System.Drawing.Size(72, 27);
             this.ob_okqty_label.TabIndex = 160;
             this.ob_okqty_label.Text = "合格数";
             // 
@@ -107,9 +112,10 @@
             // 
             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(510, 358);
+            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.Name = "ob_ngqty_label";
-            this.ob_ngqty_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_ngqty_label.Size = new System.Drawing.Size(92, 27);
             this.ob_ngqty_label.TabIndex = 162;
             this.ob_ngqty_label.Text = "不合格数";
             // 
@@ -117,9 +123,10 @@
             // 
             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(510, 274);
+            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.Name = "oi_checkqty_label";
-            this.oi_checkqty_label.Size = new System.Drawing.Size(58, 21);
+            this.oi_checkqty_label.Size = new System.Drawing.Size(72, 27);
             this.oi_checkqty_label.TabIndex = 164;
             this.oi_checkqty_label.Text = "抽检数";
             // 
@@ -127,9 +134,10 @@
             // 
             this.ReworkRequire.AutoSize = true;
             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(122, 525);
+            this.ReworkRequire.Location = new System.Drawing.Point(163, 656);
+            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ReworkRequire.Name = "ReworkRequire";
-            this.ReworkRequire.Size = new System.Drawing.Size(125, 25);
+            this.ReworkRequire.Size = new System.Drawing.Size(154, 31);
             this.ReworkRequire.TabIndex = 168;
             this.ReworkRequire.Text = "发起返工需求";
             this.ReworkRequire.UseVisualStyleBackColor = true;
@@ -138,9 +146,10 @@
             // 
             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(510, 402);
+            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.Name = "ob_aqlcode_label";
-            this.ob_aqlcode_label.Size = new System.Drawing.Size(42, 21);
+            this.ob_aqlcode_label.Size = new System.Drawing.Size(52, 27);
             this.ob_aqlcode_label.TabIndex = 169;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -148,9 +157,10 @@
             // 
             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(256, 142);
+            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.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ob_prodcode_label.TabIndex = 218;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -158,9 +168,10 @@
             // 
             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(8, 143);
+            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.Name = "ob_makecode_label";
-            this.ob_makecode_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_makecode_label.Size = new System.Drawing.Size(72, 27);
             this.ob_makecode_label.TabIndex = 216;
             this.ob_makecode_label.Text = "工单号";
             // 
@@ -168,9 +179,10 @@
             // 
             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(8, 41);
+            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.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
             this.ob_checkno_label.TabIndex = 214;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -178,9 +190,10 @@
             // 
             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(8, 73);
+            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.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
             this.obd_outboxcode_label.TabIndex = 212;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -188,9 +201,10 @@
             // 
             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(8, 107);
+            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.Name = "ms_sncode_label";
-            this.ms_sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_sncode_label.TabIndex = 210;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -201,8 +215,9 @@
             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, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(982, 30);
+            this.panel2.Size = new System.Drawing.Size(1309, 38);
             this.panel2.TabIndex = 220;
             this.panel2.Tag = "NoAuto";
             // 
@@ -211,9 +226,10 @@
             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(12, 4);
+            this.label1.Location = new System.Drawing.Point(16, 5);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(127, 21);
+            this.label1.Size = new System.Drawing.Size(157, 27);
             this.label1.TabIndex = 0;
             this.label1.Text = "OQC批结果判定";
             // 
@@ -221,9 +237,10 @@
             // 
             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(36, 454);
+            this.label3.Location = new System.Drawing.Point(48, 568);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(444, 20);
+            this.label3.Size = new System.Drawing.Size(571, 24);
             this.label3.TabIndex = 222;
             this.label3.Text = "--说明:如何物料没有维护AQL标准，需手动填写最大不合格允许通过数";
             // 
@@ -231,17 +248,19 @@
             // 
             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(36, 426);
+            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.Name = "ob_maxngacceptqty_label";
-            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(170, 21);
+            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(212, 27);
             this.ob_maxngacceptqty_label.TabIndex = 223;
             this.ob_maxngacceptqty_label.Text = "最大不合格允许通过数";
             // 
             // richTextBox1
             // 
-            this.richTextBox1.Location = new System.Drawing.Point(88, 191);
+            this.richTextBox1.Location = new System.Drawing.Point(117, 239);
+            this.richTextBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(411, 225);
+            this.richTextBox1.Size = new System.Drawing.Size(547, 280);
             this.richTextBox1.TabIndex = 225;
             this.richTextBox1.Text = "";
             // 
@@ -249,17 +268,36 @@
             // 
             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(8, 191);
+            this.label5.Location = new System.Drawing.Point(11, 239);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(42, 21);
+            this.label5.Size = new System.Drawing.Size(52, 27);
             this.label5.TabIndex = 226;
             this.label5.Text = "备注";
             // 
+            // 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.Name = "ob_status";
+            this.ob_status.Power = null;
+            this.ob_status.Size = new System.Drawing.Size(195, 25);
+            this.ob_status.Str = null;
+            this.ob_status.Str1 = null;
+            this.ob_status.Str2 = null;
+            this.ob_status.TabIndex = 231;
+            this.ob_status.Tag = "NoAuto";
+            // 
             // ob_maxngacceptqty
             // 
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(212, 426);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(283, 532);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
-            this.ob_maxngacceptqty.Size = new System.Drawing.Size(194, 21);
+            this.ob_maxngacceptqty.Size = new System.Drawing.Size(257, 25);
             this.ob_maxngacceptqty.TabIndex = 230;
             this.ob_maxngacceptqty.Text = "0";
             // 
@@ -269,10 +307,11 @@
             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(759, 75);
+            this.ob_source.Location = new System.Drawing.Point(1012, 94);
+            this.ob_source.Margin = new System.Windows.Forms.Padding(4);
             this.ob_source.Name = "ob_source";
             this.ob_source.Power = null;
-            this.ob_source.Size = new System.Drawing.Size(147, 21);
+            this.ob_source.Size = new System.Drawing.Size(195, 25);
             this.ob_source.Str = null;
             this.ob_source.Str1 = null;
             this.ob_source.Str2 = null;
@@ -286,10 +325,11 @@
             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(759, 55);
+            this.ob_id.Location = new System.Drawing.Point(1012, 69);
+            this.ob_id.Margin = new System.Windows.Forms.Padding(4);
             this.ob_id.Name = "ob_id";
             this.ob_id.Power = null;
-            this.ob_id.Size = new System.Drawing.Size(147, 21);
+            this.ob_id.Size = new System.Drawing.Size(195, 25);
             this.ob_id.Str = null;
             this.ob_id.Str1 = null;
             this.ob_id.Str2 = null;
@@ -300,9 +340,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(760, 171);
+            this.OperateResult.Location = new System.Drawing.Point(1013, 214);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(210, 319);
+            this.OperateResult.Size = new System.Drawing.Size(279, 398);
             this.OperateResult.TabIndex = 227;
             this.OperateResult.Text = "";
             // 
@@ -313,12 +354,13 @@
             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(511, 146);
+            this.GetBatch.Location = new System.Drawing.Point(681, 182);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifRead";
-            this.GetBatch.Size = new System.Drawing.Size(60, 24);
+            this.GetBatch.Size = new System.Drawing.Size(80, 30);
             this.GetBatch.TabIndex = 221;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -330,10 +372,11 @@
             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(355, 147);
+            this.ob_prodcode.Location = new System.Drawing.Point(473, 186);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
-            this.ob_prodcode.Size = new System.Drawing.Size(144, 21);
+            this.ob_prodcode.Size = new System.Drawing.Size(191, 25);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -346,10 +389,11 @@
             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(88, 145);
+            this.ob_makecode.Location = new System.Drawing.Point(117, 183);
+            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_makecode.Name = "ob_makecode";
             this.ob_makecode.Power = null;
-            this.ob_makecode.Size = new System.Drawing.Size(160, 21);
+            this.ob_makecode.Size = new System.Drawing.Size(212, 25);
             this.ob_makecode.Str = null;
             this.ob_makecode.Str1 = null;
             this.ob_makecode.Str2 = null;
@@ -361,10 +405,11 @@
             this.ob_checkno.AllPower = "ifall";
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(88, 43);
+            this.ob_checkno.Location = new System.Drawing.Point(117, 54);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "ifread";
-            this.ob_checkno.Size = new System.Drawing.Size(411, 21);
+            this.ob_checkno.Size = new System.Drawing.Size(547, 25);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -377,10 +422,11 @@
             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(88, 75);
+            this.obd_outboxcode.Location = new System.Drawing.Point(117, 94);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(411, 21);
+            this.obd_outboxcode.Size = new System.Drawing.Size(547, 25);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -393,10 +439,11 @@
             this.ms_sncode.AllPower = "ifall";
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(88, 109);
+            this.ms_sncode.Location = new System.Drawing.Point(117, 136);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "ifread";
-            this.ms_sncode.Size = new System.Drawing.Size(411, 21);
+            this.ms_sncode.Size = new System.Drawing.Size(547, 25);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -410,10 +457,11 @@
             this.ob_batchqty.BackColor = System.Drawing.Color.White;
             this.ob_batchqty.Enabled = false;
             this.ob_batchqty.ID = null;
-            this.ob_batchqty.Location = new System.Drawing.Point(600, 231);
+            this.ob_batchqty.Location = new System.Drawing.Point(800, 328);
+            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Power = null;
-            this.ob_batchqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_batchqty.Size = new System.Drawing.Size(195, 25);
             this.ob_batchqty.Str = null;
             this.ob_batchqty.Str1 = null;
             this.ob_batchqty.Str2 = null;
@@ -426,10 +474,11 @@
             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(600, 316);
+            this.ob_okqty.Location = new System.Drawing.Point(800, 414);
+            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_okqty.Name = "ob_okqty";
             this.ob_okqty.Power = null;
-            this.ob_okqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_okqty.Size = new System.Drawing.Size(195, 25);
             this.ob_okqty.Str = null;
             this.ob_okqty.Str1 = null;
             this.ob_okqty.Str2 = null;
@@ -442,10 +491,11 @@
             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(600, 274);
+            this.oi_checkqty.Location = new System.Drawing.Point(800, 370);
+            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(4);
             this.oi_checkqty.Name = "oi_checkqty";
             this.oi_checkqty.Power = null;
-            this.oi_checkqty.Size = new System.Drawing.Size(147, 21);
+            this.oi_checkqty.Size = new System.Drawing.Size(195, 25);
             this.oi_checkqty.Str = null;
             this.oi_checkqty.Str1 = null;
             this.oi_checkqty.Str2 = null;
@@ -458,10 +508,11 @@
             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(600, 358);
+            this.ob_ngqty.Location = new System.Drawing.Point(800, 456);
+            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_ngqty.Name = "ob_ngqty";
             this.ob_ngqty.Power = null;
-            this.ob_ngqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_ngqty.Size = new System.Drawing.Size(195, 25);
             this.ob_ngqty.Str = null;
             this.ob_ngqty.Str1 = null;
             this.ob_ngqty.Str2 = null;
@@ -474,10 +525,11 @@
             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(600, 190);
+            this.ob_result.Location = new System.Drawing.Point(800, 287);
+            this.ob_result.Margin = new System.Windows.Forms.Padding(4);
             this.ob_result.Name = "ob_result";
             this.ob_result.Power = null;
-            this.ob_result.Size = new System.Drawing.Size(147, 21);
+            this.ob_result.Size = new System.Drawing.Size(195, 25);
             this.ob_result.Str = null;
             this.ob_result.Str1 = null;
             this.ob_result.Str2 = null;
@@ -490,10 +542,11 @@
             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(600, 402);
+            this.ob_aqlcode.Location = new System.Drawing.Point(800, 498);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
-            this.ob_aqlcode.Size = new System.Drawing.Size(147, 21);
+            this.ob_aqlcode.Size = new System.Drawing.Size(195, 25);
             this.ob_aqlcode.Str = null;
             this.ob_aqlcode.Str1 = null;
             this.ob_aqlcode.Str2 = null;
@@ -508,12 +561,13 @@
             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(435, 485);
+            this.WithdrawPass.Location = new System.Drawing.Point(580, 606);
+            this.WithdrawPass.Margin = new System.Windows.Forms.Padding(4);
             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 = "ifWrite";
-            this.WithdrawPass.Size = new System.Drawing.Size(68, 30);
+            this.WithdrawPass.Size = new System.Drawing.Size(91, 38);
             this.WithdrawPass.TabIndex = 167;
             this.WithdrawPass.Text = "撤销通过";
             this.WithdrawPass.UseVisualStyleBackColor = true;
@@ -527,12 +581,13 @@
             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(31, 526);
+            this.BatchRejection.Location = new System.Drawing.Point(41, 658);
+            this.BatchRejection.Margin = new System.Windows.Forms.Padding(4);
             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 = "ifWrite";
-            this.BatchRejection.Size = new System.Drawing.Size(68, 30);
+            this.BatchRejection.Size = new System.Drawing.Size(91, 38);
             this.BatchRejection.TabIndex = 166;
             this.BatchRejection.Text = "批次退";
             this.BatchRejection.UseVisualStyleBackColor = true;
@@ -546,12 +601,13 @@
             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(295, 485);
+            this.ForcePass.Location = new System.Drawing.Point(393, 606);
+            this.ForcePass.Margin = new System.Windows.Forms.Padding(4);
             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 = "ifWrite";
-            this.ForcePass.Size = new System.Drawing.Size(68, 30);
+            this.ForcePass.Size = new System.Drawing.Size(91, 38);
             this.ForcePass.TabIndex = 165;
             this.ForcePass.Text = "强制通过";
             this.ForcePass.UseVisualStyleBackColor = true;
@@ -565,12 +621,13 @@
             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(295, 528);
+            this.ForceRejection.Location = new System.Drawing.Point(393, 660);
+            this.ForceRejection.Margin = new System.Windows.Forms.Padding(4);
             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 = "ifWrite";
-            this.ForceRejection.Size = new System.Drawing.Size(68, 30);
+            this.ForceRejection.Size = new System.Drawing.Size(91, 38);
             this.ForceRejection.TabIndex = 164;
             this.ForceRejection.Text = "强制批退";
             this.ForceRejection.UseVisualStyleBackColor = true;
@@ -584,12 +641,13 @@
             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(435, 528);
+            this.WithdrawRejection.Location = new System.Drawing.Point(580, 660);
+            this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(4);
             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 = "ifWrite";
-            this.WithdrawRejection.Size = new System.Drawing.Size(68, 30);
+            this.WithdrawRejection.Size = new System.Drawing.Size(91, 38);
             this.WithdrawRejection.TabIndex = 163;
             this.WithdrawRejection.Text = "撤销判退";
             this.WithdrawRejection.UseVisualStyleBackColor = true;
@@ -603,12 +661,13 @@
             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(31, 484);
+            this.BatchPass.Location = new System.Drawing.Point(41, 605);
+            this.BatchPass.Margin = new System.Windows.Forms.Padding(4);
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
             this.BatchPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.NormalImage")));
             this.BatchPass.Power = "ifWrite";
-            this.BatchPass.Size = new System.Drawing.Size(68, 30);
+            this.BatchPass.Size = new System.Drawing.Size(91, 38);
             this.BatchPass.TabIndex = 162;
             this.BatchPass.Text = "批判过";
             this.BatchPass.UseVisualStyleBackColor = true;
@@ -621,22 +680,36 @@
             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(835, 514);
+            this.Clean.Location = new System.Drawing.Point(1113, 642);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(64, 29);
+            this.Clean.Size = new System.Drawing.Size(85, 36);
             this.Clean.TabIndex = 159;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
+            // ob_status_label
+            // 
+            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.Name = "ob_status_label";
+            this.ob_status_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_status_label.TabIndex = 232;
+            this.ob_status_label.Text = "批次状态";
+            // 
             // OQC_BatchResultJudge
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(982, 565);
+            this.ClientSize = new System.Drawing.Size(1309, 706);
+            this.Controls.Add(this.ob_status_label);
+            this.Controls.Add(this.ob_status);
             this.Controls.Add(this.ob_maxngacceptqty);
             this.Controls.Add(this.ob_source);
             this.Controls.Add(this.ob_id);
@@ -678,6 +751,7 @@
             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, 4, 4, 4);
             this.Name = "OQC_BatchResultJudge";
             this.Tag = "OQC!BatchResultJudge";
             this.Text = "抽检批维护";
@@ -732,5 +806,7 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_id;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_source;
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly ob_maxngacceptqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ob_status;
+        private System.Windows.Forms.Label ob_status_label;
     }
 }

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -218,46 +218,53 @@ namespace UAS_MES.OQC
         /// <returns></returns>
         private bool CheckBefore()
         {
-            if (ob_maxngacceptqty.Text == "" || ob_maxngacceptqty.Text == "0")
+            if (ob_status.Text == "检验中")
             {
-                if (ob_aqlcode.Text == "")
-                    OperateResult.AppendText(">>最大不合格允许通过数为空的时候必须填写维护AQL标准\n", Color.Red);
-                else
+                if (ob_maxngacceptqty.Text == "" || ob_maxngacceptqty.Text == "0")
                 {
-                    dt = (DataTable)dh.ExecuteSql("select nvl(ad_minqty,0)ad_minqty,nvl(ad_maxqty,0)ad_maxqty,nvl(ad_maxngacceptqty,0)ad_maxngacceptqty from QUA_Aql left join qua_aqldetail on ad_alid=al_id where al_code='" + ob_aqlcode.Text + "'", "select");
-                    if (dt.Rows.Count > 0)
+                    if (ob_aqlcode.Text == "")
+                        OperateResult.AppendText(">>最大不合格允许通过数为空的时候必须填写维护AQL标准\n", Color.Red);
+                    else
                     {
-                        for (int i = 0; i < dt.Rows.Count; i++)
+                        dt = (DataTable)dh.ExecuteSql("select nvl(ad_minqty,0)ad_minqty,nvl(ad_maxqty,0)ad_maxqty,nvl(ad_maxngacceptqty,0)ad_maxngacceptqty from QUA_Aql left join qua_aqldetail on ad_alid=al_id where al_code='" + ob_aqlcode.Text + "'", "select");
+                        if (dt.Rows.Count > 0)
                         {
-                            int batchqty = int.Parse(ob_batchqty.Text == "" ? "0" : ob_batchqty.Text);
-                            int minqty = int.Parse(dt.Rows[i]["ad_minqty"].ToString());
-                            int maxqty = int.Parse(dt.Rows[i]["ad_maxqty"].ToString());
-                            if (batchqty > minqty && batchqty <= maxqty)
+                            for (int i = 0; i < dt.Rows.Count; i++)
                             {
-                                ob_maxngacceptqty.Text = dt.Rows[i]["ad_maxngacceptqty"].ToString();
-                                return true;
+                                int batchqty = int.Parse(ob_batchqty.Text == "" ? "0" : ob_batchqty.Text);
+                                int minqty = int.Parse(dt.Rows[i]["ad_minqty"].ToString());
+                                int maxqty = int.Parse(dt.Rows[i]["ad_maxqty"].ToString());
+                                if (batchqty > minqty && batchqty <= maxqty)
+                                {
+                                    ob_maxngacceptqty.Text = dt.Rows[i]["ad_maxngacceptqty"].ToString();
+                                    return true;
+                                }
                             }
                         }
                     }
                 }
-            }
-            else
-            {
-                sql.Clear();
-                sql.Append("select wm_concat(oi_itemcode) codes from OQCitems where ");
-                sql.Append("nvl(oi_checkqty,0)<oi_sampleqty  and oi_sampleqty>0 and rownum<30 and oi_checkno='" + ob_checkno.Text + "'");
-                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                if (dt.Rows.Count > 0)
+                else
                 {
-                    if (dt.Rows[0]["codes"].ToString() != "")
+                    sql.Clear();
+                    sql.Append("select wm_concat(oi_itemcode) codes from OQCitems where ");
+                    sql.Append("nvl(oi_checkqty,0)<oi_sampleqty  and oi_sampleqty>0 and rownum<30 and oi_checkno='" + ob_checkno.Text + "'");
+                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    if (dt.Rows.Count > 0)
                     {
-                        OperateResult.AppendText(">>项目编号抽检数未达到样本数,项目编号[" + dt.Rows[0]["codes"].ToString() + "]\n", Color.Red);
-                        return false;
+                        if (dt.Rows[0]["codes"].ToString() != "")
+                        {
+                            OperateResult.AppendText(">>项目编号抽检数未达到样本数,项目编号[" + dt.Rows[0]["codes"].ToString() + "]\n", Color.Red);
+                            return false;
+                        }
+                        else
+                            return true;
                     }
-                    else
-                        return true;
                 }
             }
+            else
+            {
+                OperateResult.AppendText(">>状态未在检验中的批次不允许进行判断\n", Color.Red);
+            }
             return false;
         }
 

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -187,6 +187,7 @@ namespace UAS_MES.OQC
         {
             if (ob_aqlcode.Text != "")
             {
+                bool Find = false;
                 dt = (DataTable)dh.ExecuteSql("select nvl(ad_minqty,0)ad_minqty,nvl(ad_maxqty,0)ad_maxqty,nvl(ad_maxngacceptqty,0)ad_maxngacceptqty,ad_qty from QUA_Aql left join qua_aqldetail on ad_alid=al_id where al_code='" + ob_aqlcode.Text + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
@@ -199,9 +200,15 @@ namespace UAS_MES.OQC
                         {
                             ob_maxngacceptqty.Text = dt.Rows[i]["ad_maxngacceptqty"].ToString();
                             ad_qty.Text = dt.Rows[i]["ad_qty"].ToString();
+                            Find = true;
                         }
                     }
                 }
+                if (!Find)
+                {
+                    ob_maxngacceptqty.Text = "";
+                    ad_qty.Text = "";
+                }
             }
         }
 

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

@@ -595,12 +595,12 @@
             this.Text = "抽样计划维护";
             this.Load += new System.EventHandler(this.抽样计划维护_Load);
             this.SizeChanged += new System.EventHandler(this.抽样计划维护_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
-            this.panel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/UAS-MES.csproj

@@ -38,10 +38,9 @@
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
-    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>263</ApplicationRevision>
+    <ApplicationRevision>265</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>