修改测试采集支持保存自动对接的不良备注

UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -85,6 +85,7 @@
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SNCodeEnterTextBox();
             this.ma_softversion = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ma_softversion_label = new System.Windows.Forms.Label();
+            this.columnHeader9 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
@@ -278,7 +279,8 @@
             this.columnHeader6,
             this.columnHeader3,
             this.columnHeader7,
-            this.columnHeader8});
+            this.columnHeader8,
+            this.columnHeader9});
             this.ChoosedRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ChoosedRejectList.Location = new System.Drawing.Point(491, 389);
             this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
@@ -774,6 +776,11 @@
             this.ma_softversion_label.TabIndex = 72;
             this.ma_softversion_label.Text = "软件版本";
             // 
+            // columnHeader9
+            // 
+            this.columnHeader9.Text = "不良备注";
+            this.columnHeader9.Width = 0;
+            // 
             // Make_TestCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -890,5 +897,6 @@
         private System.Windows.Forms.Label label7;
         private CustomControl.ValueLabel.ValueLabel ma_softversion;
         private System.Windows.Forms.Label ma_softversion_label;
+        private System.Windows.Forms.ColumnHeader columnHeader9;
     }
 }

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -269,7 +269,7 @@ namespace UAS_MES.Make
         private void LoadChoosedBadListView()
         {
             sql.Clear();
-            sql.Append("select nvl(bg_code,mb_bgcode)||':'||nvl(bg_name,mb_badcode) bg_code,nvl(mb_badcode,bc_code) bc_code,bc_name from makebad  ");
+            sql.Append("select nvl(bg_code,mb_bgcode)||':'||nvl(bg_name,mb_badcode) bg_code,nvl(mb_badcode,bc_code) bc_code,bc_name,mb_badremark from makebad  ");
             sql.Append("left join badgroup on mb_bgcode=bg_code left join badcode on mb_badcode=bc_code ");
             sql.Append(" where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and mb_status=0");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -439,7 +439,7 @@ namespace UAS_MES.Make
                             //获取不良名称
                             bcname[i] = ChoosedRejectList.Items[i].SubItems[3].Text;
                             //获取所有的不良备注
-                            bcremark[i] = bc_remark.Text;
+                            bcremark[i] = ChoosedRejectList.Items[i].SubItems[4].Text;
                         }
                     }
                 }

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

@@ -133,6 +133,8 @@
             // 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(163, 656);
             this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4);