修改不良组别取数方式

UAS-MES/FunctionCode/Make/Make_NewBadCode.cs

@@ -61,34 +61,26 @@ namespace UAS_MES.Make
             string pr_code = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_sncode='" + sncode + "' and ms_makecode='" + macode + "'").ToString();
             sql.Clear();
             sql.Append("select bg_code,bg_name from product left join productkind  on pr_kind =pk_name ");
-            sql.Append("left join productbadgroup  on  pb_kindcode= pk_code left join badgroup on ");
+            sql.Append("left join productbadgroup on pb_kindcode= pk_code left join badgroup on ");
             sql.Append("bg_code=pb_badgroup  where pr_code='" + pr_code + "' and nvl(pb_kindcode,'')<>''");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //如果未查询到数据则获取全部的不良组别
             if (dt.Rows.Count == 0)
             {
                 sql.Clear();
-                sql.Append("select bg_code from badgroup where bg_statuscode='AUDITED'");
+                sql.Append("select bg_code,bg_name from badgroup where bg_statuscode='AUDITED'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 badgroup.DataSource = dt;
-                badgroup.DisplayMember = "bg_code";
+                badgroup.DisplayMember = "bg_name";
                 badgroup.ValueMember = "bg_code";
+                LoadBadCodeListView();
             }
             else
             {
                 badgroup.DataSource = dt;
-                badgroup.DisplayMember = "bg_code";
+                badgroup.DisplayMember = "bg_name";
                 badgroup.ValueMember = "bg_code";
-                int rowCount = dt.Rows.Count;
-                string bg_code = "";
-                for (int i = 0; i < rowCount; i++)
-                {
-                    if (i == rowCount - 1)
-                        bg_code += "'" + dt.Rows[i]["bg_code"] + "'";
-                    else
-                        bg_code += "'" + dt.Rows[i]["bg_code"] + "',";
-                }
-                dt = (DataTable)dh.ExecuteSql("select bc_groupcode,bc_code,bc_name from badcode where bc_groupcode in(" + (bg_code == "" ? "''" : bg_code) + ")", "select");
+                LoadBadCodeListView();
             }
         }
 
@@ -202,7 +194,7 @@ namespace UAS_MES.Make
             sql.Append("select :id,ma_code,ms_code,ms_sncode,'" + User.UserName + "',sysdate,'" + User.CurrentStepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
             sql.Append("sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
             sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + sncode + "'");
-            dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "id", "bc_code", "bg_code"}, bccode, id, bccode, bgcode);
+            dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "id", "bc_code", "bg_code" }, bccode, id, bccode, bgcode);
             MessageBox.Show("保存成功");
             Close();
         }
@@ -217,9 +209,10 @@ namespace UAS_MES.Make
         /// </summary>
         private void LoadBadCodeListView()
         {
+            string bg_id = badgroup.SelectedValue.ToString();
             sql.Clear();
             sql.Append("select bg_code,bg_name,bc_code,bc_name,bc_note from badcode left join badgroup on bc_groupcode=bg_code left join ");
-            sql.Append("badgroupdetail on bg_id=bgd_id and bgd_badcode=bc_code where bc_groupcode='" + badgroup.Text + "' and bg_code is not null ");
+            sql.Append("badgroupdetail on bg_id=bgd_id and bgd_badcode=bc_code where bg_code='" + ((bg_id != "" && bg_id != "System.Data.DataRowView") ? bg_id.ToString() : "") + "' and bg_code is not null ");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //往listview中添加数据
             WaitRejectList.Items.Clear();

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -227,9 +227,9 @@ 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 ");
-            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("select bg_code||':'||bg_name bg_code,bc_code,bc_name from badcode left join badgroup ");
+            sql.Append("on bc_groupcode=bg_code left join badgroupdetail on bg_id=bgd_bgid and bgd_badcode=bc_code where ");
+            sql.Append("bg_code='" + (bg_code != null ? bg_code.ToString() : "") + "' and bg_code is not null");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //往listview中添加数据
             WaitRejectList.Items.Clear();