修改内容提交

UAS_MES_ODLF/FunctionCode/Query/Query_SpecialReport.Designer.cs

@@ -38,6 +38,9 @@
             this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label5 = new System.Windows.Forms.Label();
             this.Serial = new System.Windows.Forms.CheckBox();
+            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+            this.跳号数量 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
             this.SuspendLayout();
             // 
             // Export
@@ -149,11 +152,36 @@
             this.Serial.Text = "号码连续";
             this.Serial.UseVisualStyleBackColor = true;
             // 
+            // numericUpDown1
+            // 
+            this.numericUpDown1.Location = new System.Drawing.Point(909, 158);
+            this.numericUpDown1.Name = "numericUpDown1";
+            this.numericUpDown1.Size = new System.Drawing.Size(120, 35);
+            this.numericUpDown1.TabIndex = 14;
+            this.numericUpDown1.Value = new decimal(new int[] {
+            5,
+            0,
+            0,
+            0});
+            // 
+            // 跳号数量
+            // 
+            this.跳号数量.AutoSize = true;
+            this.跳号数量.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.跳号数量.Location = new System.Drawing.Point(754, 152);
+            this.跳号数量.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.跳号数量.Name = "跳号数量";
+            this.跳号数量.Size = new System.Drawing.Size(146, 41);
+            this.跳号数量.TabIndex = 15;
+            this.跳号数量.Text = "跳号数量";
+            // 
             // Query_SpecialReport
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1494, 1075);
+            this.Controls.Add(this.跳号数量);
+            this.Controls.Add(this.numericUpDown1);
             this.Controls.Add(this.Serial);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.label5);
@@ -168,6 +196,7 @@
             this.Tag = "Query!SpecialReport";
             this.Text = "Query_SpecialReport";
             this.Load += new System.EventHandler(this.Query_SpecialReport_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -184,5 +213,7 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox ma_code;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.CheckBox Serial;
+        private System.Windows.Forms.NumericUpDown numericUpDown1;
+        private System.Windows.Forms.Label 跳号数量;
     }
 }

UAS_MES_ODLF/FunctionCode/Query/Query_SpecialReport.cs

@@ -88,7 +88,7 @@ namespace UAS_MES_NEW.Query
                     }
                     else
                     {
-                        num = num + 4;
+                        num = num + int.Parse(numericUpDown1.Value.ToString());
                     }
                     dt.Rows.Add(dr);
                 }

UAS_MES_PW/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -77,9 +77,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, 233);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(1020, 466);
+            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.ob_batchqty_label.TabIndex = 158;
             this.ob_batchqty_label.Text = "实批数";
             // 
@@ -87,9 +88,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, 201);
+            this.ob_result_label.Location = new System.Drawing.Point(1020, 402);
+            this.ob_result_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.ob_result_label.TabIndex = 166;
             this.ob_result_label.Text = "判定结果";
             // 
@@ -97,9 +99,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, 302);
+            this.ob_okqty_label.Location = new System.Drawing.Point(1020, 604);
+            this.ob_okqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.ob_okqty_label.TabIndex = 160;
             this.ob_okqty_label.Text = "合格数";
             // 
@@ -107,9 +110,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, 336);
+            this.ob_ngqty_label.Location = new System.Drawing.Point(1020, 672);
+            this.ob_ngqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.ob_ngqty_label.TabIndex = 162;
             this.ob_ngqty_label.Text = "不合格数";
             // 
@@ -117,21 +121,21 @@
             // 
             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, 267);
+            this.oi_checkqty_label.Location = new System.Drawing.Point(1020, 534);
+            this.oi_checkqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.oi_checkqty_label.TabIndex = 164;
             this.oi_checkqty_label.Text = "抽检数";
             // 
             // ReworkRequire
             // 
             this.ReworkRequire.AutoSize = true;
-            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(122, 496);
+            this.ReworkRequire.Location = new System.Drawing.Point(244, 992);
+            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ReworkRequire.Name = "ReworkRequire";
-            this.ReworkRequire.Size = new System.Drawing.Size(125, 25);
+            this.ReworkRequire.Size = new System.Drawing.Size(242, 45);
             this.ReworkRequire.TabIndex = 168;
             this.ReworkRequire.Text = "发起返工需求";
             this.ReworkRequire.UseVisualStyleBackColor = true;
@@ -140,9 +144,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, 369);
+            this.ob_aqlcode_label.Location = new System.Drawing.Point(1020, 738);
+            this.ob_aqlcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(83, 41);
             this.ob_aqlcode_label.TabIndex = 169;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -150,9 +155,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(264, 116);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(528, 232);
+            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.ob_prodcode_label.TabIndex = 218;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -160,9 +166,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, 116);
+            this.ob_makecode_label.Location = new System.Drawing.Point(16, 232);
+            this.ob_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.ob_makecode_label.TabIndex = 216;
             this.ob_makecode_label.Text = "工单号";
             // 
@@ -170,9 +177,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, 12);
+            this.ob_checkno_label.Location = new System.Drawing.Point(16, 24);
+            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.ob_checkno_label.TabIndex = 214;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -180,9 +188,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, 44);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(16, 88);
+            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(82, 41);
             this.obd_outboxcode_label.TabIndex = 212;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -190,9 +199,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, 78);
+            this.ms_sncode_label.Location = new System.Drawing.Point(16, 156);
+            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.ms_sncode_label.TabIndex = 210;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -200,9 +210,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, 425);
+            this.label3.Location = new System.Drawing.Point(72, 850);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(444, 20);
+            this.label3.Size = new System.Drawing.Size(887, 36);
             this.label3.TabIndex = 222;
             this.label3.Text = "--说明:如何物料没有维护AQL标准，需手动填写最大不合格允许通过数";
             // 
@@ -210,17 +221,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, 397);
+            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(72, 794);
+            this.ob_maxngacceptqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(338, 41);
             this.ob_maxngacceptqty_label.TabIndex = 223;
             this.ob_maxngacceptqty_label.Text = "最大不合格允许通过数";
             // 
             // Remark
             // 
-            this.Remark.Location = new System.Drawing.Point(88, 162);
+            this.Remark.Location = new System.Drawing.Point(176, 324);
+            this.Remark.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(411, 225);
+            this.Remark.Size = new System.Drawing.Size(818, 446);
             this.Remark.TabIndex = 225;
             this.Remark.Tag = "Remark";
             this.Remark.Text = "";
@@ -229,9 +242,10 @@
             // 
             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, 162);
+            this.label5.Location = new System.Drawing.Point(16, 324);
+            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(42, 21);
+            this.label5.Size = new System.Drawing.Size(82, 41);
             this.label5.TabIndex = 226;
             this.label5.Text = "备注";
             // 
@@ -239,9 +253,10 @@
             // 
             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(510, 168);
+            this.ob_status_label.Location = new System.Drawing.Point(1020, 336);
+            this.ob_status_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_status_label.Name = "ob_status_label";
-            this.ob_status_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_status_label.Size = new System.Drawing.Size(146, 41);
             this.ob_status_label.TabIndex = 232;
             this.ob_status_label.Text = "批次状态";
             // 
@@ -252,12 +267,13 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = null;
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(428, 396);
+            this.normalButton1.Location = new System.Drawing.Point(856, 792);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
             this.normalButton1.Power = null;
-            this.normalButton1.Size = new System.Drawing.Size(75, 28);
+            this.normalButton1.Size = new System.Drawing.Size(150, 56);
             this.normalButton1.TabIndex = 234;
             this.normalButton1.Text = "保存备注";
             this.normalButton1.UseVisualStyleBackColor = false;
@@ -268,10 +284,11 @@
             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, 398);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(402, 796);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = "";
-            this.ob_maxngacceptqty.Size = new System.Drawing.Size(194, 21);
+            this.ob_maxngacceptqty.Size = new System.Drawing.Size(384, 35);
             this.ob_maxngacceptqty.Str = null;
             this.ob_maxngacceptqty.Str1 = null;
             this.ob_maxngacceptqty.Str2 = null;
@@ -284,10 +301,11 @@
             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(600, 168);
+            this.ob_status.Location = new System.Drawing.Point(1200, 336);
+            this.ob_status.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
-            this.ob_status.Size = new System.Drawing.Size(147, 21);
+            this.ob_status.Size = new System.Drawing.Size(290, 35);
             this.ob_status.Str = null;
             this.ob_status.Str1 = null;
             this.ob_status.Str2 = null;
@@ -300,10 +318,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, 46);
+            this.ob_source.Location = new System.Drawing.Point(1518, 92);
+            this.ob_source.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(290, 35);
             this.ob_source.Str = null;
             this.ob_source.Str1 = null;
             this.ob_source.Str2 = null;
@@ -317,10 +336,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, 26);
+            this.ob_id.Location = new System.Drawing.Point(1518, 52);
+            this.ob_id.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(290, 35);
             this.ob_id.Str = null;
             this.ob_id.Str1 = null;
             this.ob_id.Str2 = null;
@@ -331,9 +351,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, 142);
+            this.OperateResult.Location = new System.Drawing.Point(1520, 284);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(210, 319);
+            this.OperateResult.Size = new System.Drawing.Size(416, 634);
             this.OperateResult.TabIndex = 227;
             this.OperateResult.Text = "";
             // 
@@ -344,12 +365,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, 117);
+            this.GetBatch.Location = new System.Drawing.Point(1022, 234);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(120, 48);
             this.GetBatch.TabIndex = 221;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -361,10 +383,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, 120);
+            this.ob_prodcode.Location = new System.Drawing.Point(710, 240);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(284, 35);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -377,10 +400,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, 117);
+            this.ob_makecode.Location = new System.Drawing.Point(176, 234);
+            this.ob_makecode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(316, 35);
             this.ob_makecode.Str = null;
             this.ob_makecode.Str1 = null;
             this.ob_makecode.Str2 = null;
@@ -392,10 +416,11 @@
             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(88, 14);
+            this.ob_checkno.Location = new System.Drawing.Point(176, 28);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "";
-            this.ob_checkno.Size = new System.Drawing.Size(411, 21);
+            this.ob_checkno.Size = new System.Drawing.Size(818, 35);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -408,10 +433,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, 46);
+            this.obd_outboxcode.Location = new System.Drawing.Point(176, 92);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(818, 35);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -424,10 +450,11 @@
             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(88, 80);
+            this.ms_sncode.Location = new System.Drawing.Point(176, 160);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "";
-            this.ms_sncode.Size = new System.Drawing.Size(411, 21);
+            this.ms_sncode.Size = new System.Drawing.Size(818, 35);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -441,10 +468,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(600, 233);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(1200, 466);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(290, 35);
             this.ob_nowcheckqty.Str = null;
             this.ob_nowcheckqty.Str1 = null;
             this.ob_nowcheckqty.Str2 = null;
@@ -457,10 +485,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, 302);
+            this.ob_okqty.Location = new System.Drawing.Point(1200, 604);
+            this.ob_okqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(290, 35);
             this.ob_okqty.Str = null;
             this.ob_okqty.Str1 = null;
             this.ob_okqty.Str2 = null;
@@ -473,10 +502,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, 267);
+            this.oi_checkqty.Location = new System.Drawing.Point(1200, 534);
+            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(290, 35);
             this.oi_checkqty.Str = null;
             this.oi_checkqty.Str1 = null;
             this.oi_checkqty.Str2 = null;
@@ -489,10 +519,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, 336);
+            this.ob_ngqty.Location = new System.Drawing.Point(1200, 672);
+            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(290, 35);
             this.ob_ngqty.Str = null;
             this.ob_ngqty.Str1 = null;
             this.ob_ngqty.Str2 = null;
@@ -505,10 +536,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, 201);
+            this.ob_result.Location = new System.Drawing.Point(1200, 402);
+            this.ob_result.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(290, 35);
             this.ob_result.Str = null;
             this.ob_result.Str1 = null;
             this.ob_result.Str2 = null;
@@ -521,10 +553,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, 369);
+            this.ob_aqlcode.Location = new System.Drawing.Point(1200, 738);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(290, 35);
             this.ob_aqlcode.Str = null;
             this.ob_aqlcode.Str1 = null;
             this.ob_aqlcode.Str2 = null;
@@ -539,12 +572,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, 456);
+            this.WithdrawPass.Location = new System.Drawing.Point(870, 912);
+            this.WithdrawPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(68, 30);
+            this.WithdrawPass.Size = new System.Drawing.Size(136, 60);
             this.WithdrawPass.TabIndex = 167;
             this.WithdrawPass.Text = "撤销通过";
             this.WithdrawPass.UseVisualStyleBackColor = true;
@@ -558,12 +592,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, 497);
+            this.BatchRejection.Location = new System.Drawing.Point(62, 994);
+            this.BatchRejection.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(68, 30);
+            this.BatchRejection.Size = new System.Drawing.Size(136, 60);
             this.BatchRejection.TabIndex = 166;
             this.BatchRejection.Text = "批判退";
             this.BatchRejection.UseVisualStyleBackColor = true;
@@ -577,12 +612,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, 456);
+            this.ForcePass.Location = new System.Drawing.Point(590, 912);
+            this.ForcePass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(68, 30);
+            this.ForcePass.Size = new System.Drawing.Size(136, 60);
             this.ForcePass.TabIndex = 165;
             this.ForcePass.Text = "强制通过";
             this.ForcePass.UseVisualStyleBackColor = true;
@@ -596,12 +632,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, 497);
+            this.ForceRejection.Location = new System.Drawing.Point(590, 994);
+            this.ForceRejection.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(68, 30);
+            this.ForceRejection.Size = new System.Drawing.Size(136, 60);
             this.ForceRejection.TabIndex = 164;
             this.ForceRejection.Text = "强制批退";
             this.ForceRejection.UseVisualStyleBackColor = true;
@@ -615,12 +652,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, 497);
+            this.WithdrawRejection.Location = new System.Drawing.Point(870, 994);
+            this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(68, 30);
+            this.WithdrawRejection.Size = new System.Drawing.Size(136, 60);
             this.WithdrawRejection.TabIndex = 163;
             this.WithdrawRejection.Text = "撤销判退";
             this.WithdrawRejection.UseVisualStyleBackColor = true;
@@ -634,12 +672,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, 455);
+            this.BatchPass.Location = new System.Drawing.Point(62, 910);
+            this.BatchPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(68, 30);
+            this.BatchPass.Size = new System.Drawing.Size(136, 60);
             this.BatchPass.TabIndex = 162;
             this.BatchPass.Text = "批判过";
             this.BatchPass.UseVisualStyleBackColor = true;
@@ -652,12 +691,13 @@
             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, 485);
+            this.Clean.Location = new System.Drawing.Point(1670, 970);
+            this.Clean.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(128, 58);
             this.Clean.TabIndex = 159;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -665,9 +705,9 @@
             // 
             // OQC_BatchResultJudge
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(975, 537);
+            this.ClientSize = new System.Drawing.Size(1950, 1074);
             this.Controls.Add(this.normalButton1);
             this.Controls.Add(this.ob_maxngacceptqty);
             this.Controls.Add(this.ob_status_label);
@@ -711,13 +751,14 @@
             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(6, 6, 6, 6);
             this.Name = "OQC_BatchResultJudge";
             this.Tag = "OQC!BatchResultJudge";
             this.Text = "抽检批维护";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OQC_BatchResultJudge_FormClosing);
             this.Load += new System.EventHandler(this.抽检批维护_Load);
             this.SizeChanged += new System.EventHandler(this.抽检批维护_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_FeedingCollection.cs

@@ -407,12 +407,6 @@ namespace UAS_MES_NEW.Make
             else
             {
                 OperateResult.AppendText(">>序列号" + sn_code.Text + "不在本道工序，请采集其它序列号\n", Color.Red);
-                SetCheck set = new SetCheck("NG", Color.Red);
-                BaseUtil.SetFormCenter(set);
-                set.ShowDialog();
-                code.Text = "";
-                sn_code.Text = "";
-                return;
                 if (!LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                     OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 else
@@ -422,7 +416,8 @@ namespace UAS_MES_NEW.Make
                         OperateResult.AppendText(">>" + ErrorMessage + "\n");
                     OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
                 }
-              
+                code.Text = "";
+                sn_code.Text = "";
             }
         }
 

UAS_MES_YD/FunctionCode/Make/Make_Repair.Designer.cs

@@ -223,7 +223,7 @@
             // 
             // GetSNCode_Label
             // 
-            this.GetSNCode_Label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.GetSNCode_Label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode_Label.AutoSize = true;
             this.GetSNCode_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -325,13 +325,19 @@
             "",
             "主板",
             "液晶屏",
-            "电路板",
             "喇叭",
             "摄像头",
             "MIC板",
             "底壳",
-            "FPC排线",
             "电池",
+            "面壳",
+            "天线/喇叭支架",
+            "A壳组件",
+            "B壳组件",
+            "C壳组件",
+            "D壳组件",
+            "通讯小板",
+            "接口小板",
             "其他"});
             this.mbc_component.Location = new System.Drawing.Point(524, 458);
             this.mbc_component.Margin = new System.Windows.Forms.Padding(6);
@@ -449,11 +455,11 @@
             // 
             // ms_reworkcheckno
             // 
-            this.ms_reworkcheckno.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.ms_reworkcheckno.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_reworkcheckno.AutoSize = true;
             this.ms_reworkcheckno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_reworkcheckno.Location = new System.Drawing.Point(1582, 116);
+            this.ms_reworkcheckno.Location = new System.Drawing.Point(1584, 118);
             this.ms_reworkcheckno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_reworkcheckno.Name = "ms_reworkcheckno";
             this.ms_reworkcheckno.Size = new System.Drawing.Size(146, 41);
@@ -463,11 +469,11 @@
             // 
             // ms_makecode_label
             // 
-            this.ms_makecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.ms_makecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(404, 52);
+            this.ms_makecode_label.Location = new System.Drawing.Point(406, 54);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(114, 41);
@@ -476,11 +482,11 @@
             // 
             // ms_sncode_label
             // 
-            this.ms_sncode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.ms_sncode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             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(28, 50);
+            this.ms_sncode_label.Location = new System.Drawing.Point(30, 52);
             this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Size = new System.Drawing.Size(114, 41);
@@ -489,11 +495,11 @@
             // 
             // ms_checkno
             // 
-            this.ms_checkno.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.ms_checkno.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_checkno.AutoSize = true;
             this.ms_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_checkno.Location = new System.Drawing.Point(1578, 52);
+            this.ms_checkno.Location = new System.Drawing.Point(1580, 54);
             this.ms_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_checkno.Name = "ms_checkno";
             this.ms_checkno.Size = new System.Drawing.Size(146, 41);
@@ -524,12 +530,12 @@
             // 
             // ms_sncode
             // 
-            this.ms_sncode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.ms_sncode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_sncode.AutoSize = true;
             this.ms_sncode.CutLength = null;
             this.ms_sncode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode.Location = new System.Drawing.Point(178, 52);
+            this.ms_sncode.Location = new System.Drawing.Point(180, 54);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_sncode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_sncode.Name = "ms_sncode";
@@ -562,7 +568,7 @@
             this.nr_code.AutoSize = true;
             this.nr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_code.ForeColor = System.Drawing.Color.Black;
-            this.nr_code.Location = new System.Drawing.Point(1678, 442);
+            this.nr_code.Location = new System.Drawing.Point(1680, 444);
             this.nr_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.nr_code.Name = "nr_code";
             this.nr_code.Size = new System.Drawing.Size(0, 41);
@@ -570,11 +576,11 @@
             // 
             // st_rstepcode_label
             // 
-            this.st_rstepcode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.st_rstepcode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.st_rstepcode_label.AutoSize = true;
             this.st_rstepcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_rstepcode_label.Location = new System.Drawing.Point(528, 128);
+            this.st_rstepcode_label.Location = new System.Drawing.Point(530, 130);
             this.st_rstepcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.st_rstepcode_label.Name = "st_rstepcode_label";
             this.st_rstepcode_label.Size = new System.Drawing.Size(146, 41);
@@ -583,11 +589,11 @@
             // 
             // ma_craftcode_label
             // 
-            this.ma_craftcode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.ma_craftcode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ma_craftcode_label.AutoSize = true;
             this.ma_craftcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_craftcode_label.Location = new System.Drawing.Point(28, 128);
+            this.ma_craftcode_label.Location = new System.Drawing.Point(30, 130);
             this.ma_craftcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_craftcode_label.Name = "ma_craftcode_label";
             this.ma_craftcode_label.Size = new System.Drawing.Size(146, 41);
@@ -618,11 +624,11 @@
             // 
             // pr_detail_label
             // 
-            this.pr_detail_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.pr_detail_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             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(1272, 52);
+            this.pr_detail_label.Location = new System.Drawing.Point(1274, 54);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
@@ -631,11 +637,11 @@
             // 
             // ms_prodcode_label
             // 
-            this.ms_prodcode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.ms_prodcode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_prodcode_label.AutoSize = true;
             this.ms_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode_label.Location = new System.Drawing.Point(814, 52);
+            this.ms_prodcode_label.Location = new System.Drawing.Point(816, 54);
             this.ms_prodcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_prodcode_label.Name = "ms_prodcode_label";
             this.ms_prodcode_label.Size = new System.Drawing.Size(146, 41);
@@ -644,12 +650,12 @@
             // 
             // pr_detail
             // 
-            this.pr_detail.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.pr_detail.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(1464, 52);
+            this.pr_detail.Location = new System.Drawing.Point(1466, 54);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_detail.Name = "pr_detail";
@@ -658,12 +664,12 @@
             // 
             // ms_prodcode
             // 
-            this.ms_prodcode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.ms_prodcode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_prodcode.AutoSize = true;
             this.ms_prodcode.CutLength = null;
             this.ms_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode.Location = new System.Drawing.Point(1006, 52);
+            this.ms_prodcode.Location = new System.Drawing.Point(1008, 54);
             this.ms_prodcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_prodcode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_prodcode.Name = "ms_prodcode";
@@ -673,12 +679,12 @@
             // 
             // ms_makecode
             // 
-            this.ms_makecode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.ms_makecode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(564, 52);
+            this.ms_makecode.Location = new System.Drawing.Point(566, 54);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -813,7 +819,7 @@
             // GetSNCode
             // 
             this.GetSNCode.AllPower = null;
-            this.GetSNCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.GetSNCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.ID = null;
@@ -892,7 +898,7 @@
             // mbl_loc
             // 
             this.mbl_loc.AllPower = null;
-            this.mbl_loc.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.mbl_loc.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.mbl_loc.BackColor = System.Drawing.Color.White;
             this.mbl_loc.ID = null;
@@ -911,7 +917,7 @@
             // bc_name
             // 
             this.bc_name.AllPower = null;
-            this.bc_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.bc_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.bc_name.BackColor = System.Drawing.Color.White;
             this.bc_name.Enabled = false;
@@ -930,7 +936,7 @@
             // bg_name
             // 
             this.bg_name.AllPower = null;
-            this.bg_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.bg_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.bg_name.BackColor = System.Drawing.Color.White;
             this.bg_name.Enabled = false;

UAS_MES_YD/FunctionCode/Make/Make_Repair.cs

@@ -308,7 +308,7 @@ namespace UAS_MES_NEW.Make
                                 sql.Clear();
                                 sql.Append("select cd_stepcode from craft left join craftdetail on cr_id =cd_crid where ");
                                 sql.Append("cr_code='" + cr_code.Text + "' and cr_prodcode='" + ms_prodcode.Text + "' and  ");
-                                sql.Append("nvl(cd_ifburnin,0)<>0 and cd_detno <='" + currentdetno + "'");
+                                sql.Append("nvl(cd_ifspc,0)<>0 and cd_detno <='" + currentdetno + "' order by cd_detno desc");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 if (dt.Rows.Count > 0)
                                 {

UAS_MES_YD/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -102,11 +102,11 @@ namespace UAS_MES_NEW.Make
             this.bc_groupcode = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.ms_sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.WriteSoftWare = new UAS_MES_NEW.CustomControl.CustomCheckBox.ReSetCheckBox();
-            this.SoftWarePath = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label10 = new System.Windows.Forms.Label();
             this.Printer = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.AutoPrintBad = new System.Windows.Forms.CheckBox();
             this.RePrint = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.IfTest = new UAS_MES_NEW.CustomControl.CustomCheckBox.ReSetCheckBox();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).BeginInit();
             this.SuspendLayout();
@@ -219,7 +219,7 @@ namespace UAS_MES_NEW.Make
             // columnHeader5
             // 
             this.columnHeader5.Text = " ";
-            this.columnHeader5.Width = 20;
+            this.columnHeader5.Width = 0;
             // 
             // columnHeader4
             // 
@@ -231,12 +231,12 @@ namespace UAS_MES_NEW.Make
             // 
             this.columnHeader1.Text = "不良代码";
             this.columnHeader1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader1.Width = 143;
+            this.columnHeader1.Width = 134;
             // 
             // columnHeader2
             // 
             this.columnHeader2.Text = "不良名称";
-            this.columnHeader2.Width = 122;
+            this.columnHeader2.Width = 392;
             // 
             // columnHeader9
             // 
@@ -305,13 +305,13 @@ namespace UAS_MES_NEW.Make
             // 
             this.columnHeader3.Text = "不良代码组";
             this.columnHeader3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader3.Width = 117;
+            this.columnHeader3.Width = 150;
             // 
             // columnHeader7
             // 
             this.columnHeader7.Text = "不良代码";
             this.columnHeader7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader7.Width = 95;
+            this.columnHeader7.Width = 168;
             // 
             // columnHeader8
             // 
@@ -321,7 +321,7 @@ namespace UAS_MES_NEW.Make
             // columnHeader10
             // 
             this.columnHeader10.Text = "备注";
-            this.columnHeader10.Width = 0;
+            this.columnHeader10.Width = 3;
             // 
             // ma_qty_label
             // 
@@ -925,29 +925,14 @@ namespace UAS_MES_NEW.Make
             // 
             this.WriteSoftWare.AutoSize = true;
             this.WriteSoftWare.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WriteSoftWare.Location = new System.Drawing.Point(1123, 1006);
+            this.WriteSoftWare.Location = new System.Drawing.Point(1157, 1002);
             this.WriteSoftWare.Margin = new System.Windows.Forms.Padding(4);
             this.WriteSoftWare.Name = "WriteSoftWare";
-            this.WriteSoftWare.Size = new System.Drawing.Size(142, 35);
+            this.WriteSoftWare.Size = new System.Drawing.Size(128, 35);
             this.WriteSoftWare.TabIndex = 195;
-            this.WriteSoftWare.Text = "烧入软件";
+            this.WriteSoftWare.Text = "解绑SN";
             this.WriteSoftWare.UseVisualStyleBackColor = true;
-            // 
-            // SoftWarePath
-            // 
-            this.SoftWarePath.AllPower = null;
-            this.SoftWarePath.BackColor = System.Drawing.Color.White;
-            this.SoftWarePath.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SoftWarePath.ID = null;
-            this.SoftWarePath.Location = new System.Drawing.Point(1275, 1001);
-            this.SoftWarePath.Margin = new System.Windows.Forms.Padding(6);
-            this.SoftWarePath.Name = "SoftWarePath";
-            this.SoftWarePath.Power = null;
-            this.SoftWarePath.Size = new System.Drawing.Size(388, 40);
-            this.SoftWarePath.Str = null;
-            this.SoftWarePath.Str1 = null;
-            this.SoftWarePath.Str2 = null;
-            this.SoftWarePath.TabIndex = 196;
+            this.WriteSoftWare.CheckedChanged += new System.EventHandler(this.WriteSoftWare_CheckedChanged);
             // 
             // label10
             // 
@@ -999,17 +984,29 @@ namespace UAS_MES_NEW.Make
             this.RePrint.UseVisualStyleBackColor = true;
             this.RePrint.Click += new System.EventHandler(this.RePrint_Click);
             // 
+            // IfTest
+            // 
+            this.IfTest.AutoSize = true;
+            this.IfTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.IfTest.Location = new System.Drawing.Point(1556, 1003);
+            this.IfTest.Margin = new System.Windows.Forms.Padding(4);
+            this.IfTest.Name = "IfTest";
+            this.IfTest.Size = new System.Drawing.Size(142, 35);
+            this.IfTest.TabIndex = 201;
+            this.IfTest.Text = "是否抽检";
+            this.IfTest.UseVisualStyleBackColor = true;
+            // 
             // Make_TestCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1724, 1070);
+            this.Controls.Add(this.IfTest);
             this.Controls.Add(this.RePrint);
             this.Controls.Add(this.AutoPrintBad);
             this.Controls.Add(this.label10);
             this.Controls.Add(this.Printer);
-            this.Controls.Add(this.SoftWarePath);
             this.Controls.Add(this.WriteSoftWare);
             this.Controls.Add(this.ob_sendqty);
             this.Controls.Add(this.StepCount);
@@ -1138,7 +1135,6 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.Label pr_sendchecktype;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
         private ReSetCheckBox WriteSoftWare;
-        private CustomControl.TextBoxWithIcon.EnterTextBox SoftWarePath;
         private CustomControl.ValueLabel.ValueLabel mcd_ngqty;
         private System.Windows.Forms.Label label1;
         private CustomControl.ValueLabel.ValueLabel mcd_totalng;
@@ -1149,5 +1145,6 @@ namespace UAS_MES_NEW.Make
         private CustomControl.ComBoxWithFocus.PrinterCombox Printer;
         private System.Windows.Forms.CheckBox AutoPrintBad;
         private CustomControl.ButtonUtil.NormalButton RePrint;
+        private ReSetCheckBox IfTest;
     }
 }

UAS_MES_YD/FunctionCode/Make/Make_TestCollection.cs

@@ -75,7 +75,7 @@ namespace UAS_MES_NEW.Make
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,pr_spec # 产品规格,ma_softversion # 软件版本,ma_salecode # 销售单号,pr_sendchecktype # 产品送检方式";
             ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_spec", "ma_softversion", "ma_salecode", "nvl(pr_sendchecktype,'LineCode')pr_sendchecktype" };
+            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "substr(pr_spec,0,50)pr_spec", "ma_softversion", "ma_salecode", "nvl(pr_sendchecktype,'LineCode')pr_sendchecktype" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DbChange;
             dh = SystemInf.dh;
@@ -226,7 +226,7 @@ namespace UAS_MES_NEW.Make
                         }
                         if (ma_code.Text != oMakeCode && oMakeCode != null)
                         {
-                            dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,ma_salecode,pr_spec,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
+                            dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,ma_salecode,substr(pr_spec,0,50)pr_spec,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
                             if (dt.Rows.Count > 0)
                             {
                                 BaseUtil.SetFormValue(this.Controls, dt);
@@ -393,6 +393,10 @@ namespace UAS_MES_NEW.Make
                                 dh.ExecuteSql("delete from makesnrelation where sn='" + ms_sncode.Text + "' and makecode='" + ma_code.Text + "'", "delete");
                                 dh.ExecuteSql("update makeserial set ms_sncode=ms_firstsn where ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + ma_code.Text + "'", "update");
                             }
+                            if (IfTest.Checked)
+                            {
+                                dh.ExecuteSql("update makeserial set ms_iftest=-1 where ms_id='"+oMSID+"'", "update");
+                            }
                             //提示正确返回时传递的信息
                             if (ErrorMessage.Contains("AFTERSUCCESS"))
                                 OperateResult.AppendText(">>" + ErrorMessage + "\n");
@@ -471,7 +475,7 @@ namespace UAS_MES_NEW.Make
                     }
                     if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == "" ? oMakeCode : ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,pr_spec,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
+                        dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,substr(pr_spec,0,50)pr_spec,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
                         if (dt.Rows.Count > 0)
                         {
                             BaseUtil.SetFormValue(this.Controls, dt);
@@ -572,6 +576,10 @@ namespace UAS_MES_NEW.Make
                         else OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为不良\n", Color.Green);
                     }
                     else OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为不良\n", Color.Green);
+                    if (IfTest.Checked)
+                    {
+                        dh.ExecuteSql("update makeserial set ms_iftest=-1 where ms_id='" + oMSID + "'", "update");
+                    }
                     //打印不良代码贴纸
                     if (EnablePrint && AutoPrintBad.Checked)
                     {
@@ -842,5 +850,10 @@ namespace UAS_MES_NEW.Make
                 }
             }
         }
+
+        private void WriteSoftWare_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }