|
|
@@ -103,7 +103,7 @@ namespace UAS_MES.Make
|
|
|
sql.Append("select sp_id,sp_oneuseqty,sp_soncode,sp_prefix from stepbom left join stepproduct on sp_sbid=sb_id ");
|
|
|
sql.Append("where sb_craftcode='" + ma_craftcode.Text + "' and sb_prodcode='" + ma_prodcode.Text + "' and ");
|
|
|
sql.Append("sb_bomversion='" + ma_bomversion.Text + "' and sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 ");
|
|
|
- sql.Append("and instr('" + pr_batchnum.Text + "',SP_SONCODE) > 0");
|
|
|
+ sql.Append("and (instr('" + pr_batchnum.Text + "',SP_SONCODE) > 0 or instr('" + pr_batchnum.Text + "',SP_FSONCODE)>0)");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -162,7 +162,7 @@ namespace UAS_MES.Make
|
|
|
sql.Clear();
|
|
|
sql.Append("select nvl(mss_makecode,' ') mss_makecode,sp_fsoncode,nvl(mss_id,0) mss_id,sp_soncode,mss_prodcode,sp_oneuseqty,mss_barcode,nvl(mss_qty,0) mss_qty ,nvl(mss_remain,0)mss_remain,");
|
|
|
sql.Append("pr_detail,nvl(mss_useqty,0) mss_useqty from stepbom left join stepproduct on sp_sbid=sb_id left join product on ");
|
|
|
- sql.Append("pr_code=sp_mothercode left join makesourcestock on mss_craftcode=sb_craftcode ");
|
|
|
+ sql.Append("pr_code=sp_mothercode left join makesourcestock on mss_craftcode=sb_craftcode and mss_makecode='"+ma_code.Text+"' ");
|
|
|
sql.Append("and mss_stepcode=sp_stepcode and sp_soncode=mss_prodcode left join make on ma_bomversion=sb_bomversion where sb_prodcode='" + ma_prodcode.Text + "' and sb_craftcode='" + ma_craftcode.Text + "' ");
|
|
|
sql.Append("and sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 and ma_code='" + ma_code.Text + "' order by sp_soncode");
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
章政