Selaa lähdekoodia

修改添加字段导致的BUG

章政 8 vuotta sitten
vanhempi
commit
32f9dcff8d

+ 10 - 2
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();
@@ -204,7 +205,8 @@
             this.columnHeader5,
             this.columnHeader4,
             this.columnHeader1,
-            this.columnHeader2});
+            this.columnHeader2,
+            this.columnHeader9});
             this.WaitRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.WaitRejectList.Location = new System.Drawing.Point(5, 389);
             this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
@@ -234,7 +236,7 @@
             // columnHeader2
             // 
             this.columnHeader2.Text = "不良名称";
-            this.columnHeader2.Width = 161;
+            this.columnHeader2.Width = 122;
             // 
             // label4
             // 
@@ -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;
     }
 }

+ 3 - 2
UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -240,7 +240,7 @@ namespace UAS_MES.Make
         {
             object bg_code = bc_groupcode.SelectedValue;
             sql.Clear();
-            sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_name from badgroupdetail ");
+            sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_name,'' bc_remark from badgroupdetail ");
             sql.Append("left join badgroup on  bg_id=bgd_bgid left join badcode on bgd_badcode=bc_code where ");
             sql.Append("bg_code='" + (bg_code != null ? bg_code.ToString() : "") + "' and bg_code is not null order by bgd_detno");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -428,6 +428,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
+                        Console.WriteLine(ChoosedRejectList.Items[0].SubItems.Count);
                         for (int i = 0; i < RejectCount; i++)
                         {
                             //获取不良代码组
@@ -439,7 +440,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;
                         }
                     }
                 }