|
|
@@ -86,7 +86,7 @@ namespace UAS_MES.Make
|
|
|
string bar_remain = dt.Rows[0]["bar_remain"].ToString();
|
|
|
string bar_prodcode = dt.Rows[0]["bar_prodcode"].ToString();
|
|
|
sql.Clear();
|
|
|
- sql.Append("select sp_id,sp_oneuseqty,sp_soncode,sp_prefix from stepbom left join stepproduct on sp_sbid=sb_id ");
|
|
|
+ sql.Append("select sp_id,sp_oneuseqty,sp_fsoncode,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_soncode ='" + bar_prodcode + "' and sp_tracekind=2 ");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
@@ -100,7 +100,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//是否包含备料的批管控物料号
|
|
|
sql.Clear();
|
|
|
- sql.Append("select sp_id,sp_oneuseqty,sp_soncode,sp_prefix from stepbom left join stepproduct on sp_sbid=sb_id ");
|
|
|
+ sql.Append("select sp_id,sp_oneuseqty,sp_fsoncode,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 or instr('" + pr_batchnum.Text + "',SP_FSONCODE)>0)");
|
|
|
@@ -113,7 +113,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//匹配批管控物料中的前缀和长度
|
|
|
sql.Clear();
|
|
|
- sql.Append("select sp_id,sp_oneuseqty,sp_soncode,sp_prefix from stepbom left join stepproduct on sp_sbid=sb_id ");
|
|
|
+ sql.Append("select sp_id,sp_fsoncode,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_prefix) > 0 and ((nvl(SP_LENGTH,0)>0 and sp_length ");
|
|
|
@@ -138,7 +138,7 @@ namespace UAS_MES.Make
|
|
|
private void InsertMakeSourceStock(DataTable dt, int Barremain)
|
|
|
{
|
|
|
string sp_oneuseqty = dt.Rows[0]["sp_oneuseqty"].ToString();
|
|
|
- string sp_soncode = dt.Rows[0]["sp_soncode"].ToString();
|
|
|
+ string sp_soncode = dt.Rows[0]["sp_fsoncode"].ToString();
|
|
|
string sp_prefix = dt.Rows[0]["sp_prefix"].ToString();
|
|
|
sql.Clear();
|
|
|
sql.Append("insert into makesourcestock (mss_id,mss_makecode,mss_linecode ,mss_craftcode,");
|
章政