|
|
@@ -297,7 +297,7 @@ namespace UAS_MES_NEW.Make
|
|
|
sql.Append("select bg_code||':'||bg_name bg_name,bg_code from badgroup left join (select pb_badgroup,pr_kind ");
|
|
|
sql.Append("from product left join productkind on pk_name=pr_kind ");
|
|
|
sql.Append("left join productbadgroup on pk_code=PB_KINDCODE where pr_code='" + ma_prodcode.Text + "')");
|
|
|
- sql.Append("on pb_badgroup=bg_code where bg_statuscode='AUDITED' and BG_FLOOR='" + User.Floor + "' order by case when bg_code='" + User.DefaultBadGroup + "' then 0 else 1 end");
|
|
|
+ sql.Append("on pb_badgroup=bg_code where bg_statuscode='AUDITED' and instr(BG_FLOOR,'" + User.Floor + "')>0 order by case when bg_code='" + User.DefaultBadGroup + "' then 0 else 1 end");
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
bc_groupcode.DisplayMember = "bg_name";
|
|
|
bc_groupcode.ValueMember = "bg_code";
|
|
|
@@ -314,7 +314,7 @@ namespace UAS_MES_NEW.Make
|
|
|
sql.Clear();
|
|
|
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_FLOOR='" + User.Floor + "' and bg_code is not null order by bgd_detno");
|
|
|
+ sql.Append("bg_code='" + (bg_code != null ? bg_code.ToString() : "") + "' and instr(BG_FLOOR,'" + User.Floor + "')>0 and bg_code is not null order by bgd_detno");
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
BadInfSource.DataSource = dt;
|
|
|
//往listview中添加数据
|
callm