浏览代码

重新取不良信息明细和修改不良采集显示不良名称

章政 8 年之前
父节点
当前提交
f4442f4f1e

+ 8 - 10
UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -219,19 +219,18 @@
             // 
             // 
             this.columnHeader4.Text = "不良代码组";
             this.columnHeader4.Text = "不良代码组";
             this.columnHeader4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.columnHeader4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader4.Width = 115;
+            this.columnHeader4.Width = 0;
             // 
             // 
             // columnHeader1
             // columnHeader1
             // 
             // 
             this.columnHeader1.Text = "不良代码";
             this.columnHeader1.Text = "不良代码";
             this.columnHeader1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.columnHeader1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader1.Width = 90;
+            this.columnHeader1.Width = 143;
             // 
             // 
             // columnHeader2
             // columnHeader2
             // 
             // 
-            this.columnHeader2.Text = "备注";
-            this.columnHeader2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader2.Width = 75;
+            this.columnHeader2.Text = "不良名称";
+            this.columnHeader2.Width = 161;
             // 
             // 
             // label4
             // label4
             // 
             // 
@@ -304,9 +303,8 @@
             // 
             // 
             // columnHeader8
             // columnHeader8
             // 
             // 
-            this.columnHeader8.Text = "备注";
-            this.columnHeader8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader8.Width = 75;
+            this.columnHeader8.Text = "不良名称";
+            this.columnHeader8.Width = 99;
             // 
             // 
             // AutoBadCode
             // AutoBadCode
             // 
             // 
@@ -797,14 +795,12 @@
         private CustomControl.ButtonUtil.ArrowLeftButton WaitReject;
         private CustomControl.ButtonUtil.ArrowLeftButton WaitReject;
         private CustomControl.ButtonUtil.ArrowRightButton ChooseedReject;
         private CustomControl.ButtonUtil.ArrowRightButton ChooseedReject;
         private System.Windows.Forms.ColumnHeader columnHeader1;
         private System.Windows.Forms.ColumnHeader columnHeader1;
-        private System.Windows.Forms.ColumnHeader columnHeader2;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label6;
         private CustomControl.ButtonUtil.NormalButton CleanInfo;
         private CustomControl.ButtonUtil.NormalButton CleanInfo;
         private System.Windows.Forms.ColumnHeader columnHeader5;
         private System.Windows.Forms.ColumnHeader columnHeader5;
         private System.Windows.Forms.ListView ChoosedRejectList;
         private System.Windows.Forms.ListView ChoosedRejectList;
         private System.Windows.Forms.ColumnHeader columnHeader6;
         private System.Windows.Forms.ColumnHeader columnHeader6;
         private System.Windows.Forms.ColumnHeader columnHeader7;
         private System.Windows.Forms.ColumnHeader columnHeader7;
-        private System.Windows.Forms.ColumnHeader columnHeader8;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
         private CustomControl.ValueLabel.ValueLabel mcd_inqty;
         private CustomControl.ValueLabel.ValueLabel mcd_inqty;
@@ -826,5 +822,7 @@
         private CustomControl.ButtonUtil.NormalButton SendCheck;
         private CustomControl.ButtonUtil.NormalButton SendCheck;
         private System.Windows.Forms.Label ob_checkno;
         private System.Windows.Forms.Label ob_checkno;
         private System.Windows.Forms.Label pr_detail_label;
         private System.Windows.Forms.Label pr_detail_label;
+        private System.Windows.Forms.ColumnHeader columnHeader2;
+        private System.Windows.Forms.ColumnHeader columnHeader8;
     }
     }
 }
 }

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

@@ -227,7 +227,7 @@ namespace UAS_MES.Make
         {
         {
             object bg_code = bc_groupcode.SelectedValue;
             object bg_code = bc_groupcode.SelectedValue;
             sql.Clear();
             sql.Clear();
-            sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_note ");
+            sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_name ");
             sql.Append("from badcode left join badgroup on bc_groupcode=bg_code  where ");
             sql.Append("from badcode left join badgroup on bc_groupcode=bg_code  where ");
             sql.Append("bc_groupcode='" + (bg_code != null ? bg_code.ToString() : "") + "' and bg_code is not null");
             sql.Append("bc_groupcode='" + (bg_code != null ? bg_code.ToString() : "") + "' and bg_code is not null");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -403,7 +403,7 @@ namespace UAS_MES.Make
                             //获取所有的不良代码
                             //获取所有的不良代码
                             bccode[i] = ChoosedRejectList.Items[i].SubItems[2].Text;
                             bccode[i] = ChoosedRejectList.Items[i].SubItems[2].Text;
                             //获取所有的不良备注
                             //获取所有的不良备注
-                            bcremark[i] = ChoosedRejectList.Items[i].SubItems[3].Text;
+                            bcremark[i] = bc_remark.Text;
                         }
                         }
                     }
                     }
                 }
                 }