|
|
@@ -437,7 +437,7 @@ namespace UAS_MES_NEW.Make
|
|
|
sql.Append("select '主料' sptype,0 spr_id,-1 spr_isreplace,max(sp_rate)sp_rate,max(pr_lightbox)pr_lightbox,sp_id,max(nvl(sp_subnum,0))sp_subnum,max(nvl(sp_subnumlength,0))sp_subnumlength,max(sp_detno)sp_detno,min(sp_ifrepeat)sp_ifrepeat,max(sp_checkbarcode)sp_checkbarcode,min(sp_checksalecode)sp_checksalecode,");
|
|
|
sql.Append("sp_fsoncode,max(sp_barcoderule)sp_barcoderule,max(sp_sntype)sp_sntype,wm_concat(sp_soncode) sp_soncode,max(sp_ifuseregex)sp_ifuseregex,max(sp_ifforsn)");
|
|
|
sql.Append("sp_ifforsn,max(sp_length)sp_length,max(sp_type)sp_type,replace(wm_concat(sp_prefix),',','|')sp_prefix,max(sp_regex)");
|
|
|
- sql.Append("sp_regex,max(pr_detail)pr_detail,max(substr(pr_spec,0,20))pr_spec from stepproduct left join product on pr_code=sp_fsoncode where ");
|
|
|
+ sql.Append("sp_regex,max(pr_detail)pr_detail,max(substr(pr_detail,0,20))pr_spec from stepproduct left join product on pr_code=sp_fsoncode where ");
|
|
|
sql.Append("sp_bomversion='" + ms_bomversion.Text + "' and sp_craftcode='" + ms_craftcode.Text + "' and instr('" + ms_paststep + "',sp_stepcode)>0 ");
|
|
|
sql.Append("And sp_mothercode ='" + ma_prodcode.Text + "' and sp_tracekind=1 and nvl(pr_prodtype,' ')<>'包装物料' and not exists(select 1 from craftmaterial where ");
|
|
|
sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_makecode='" + ma_code.Text + "' and cm_spid=");
|
|
|
@@ -445,7 +445,7 @@ namespace UAS_MES_NEW.Make
|
|
|
sql.Append("select '替代' sptype,spr_id,max(spr_isreplace),max(spr_rate)spr_rate,max(pr_lightbox)pr_lightbox,spr_spid,max(nvl(spr_subnum,0))spr_subnum,max(nvl(spr_subnumlength,0))spr_subnumlength,max(spr_detno)spr_detno,min(spr_ifrepeat)spr_ifrepeat,max(spr_checkbarcode)spr_checkbarcode,min(spr_checksalecode)spr_checksalecode,");
|
|
|
sql.Append("spr_fsoncode,max(spr_barcoderule)spr_barcoderule,max(spr_sntype)spr_sntype,wm_concat(spr_soncode) spr_soncode,max(spr_ifuseregex)spr_ifuseregex,max(spr_ifforsn)");
|
|
|
sql.Append("spr_ifforsn,max(spr_length)spr_length,max(spr_type)spr_type,replace(wm_concat(spr_prefix),',','|')spr_prefix,max(spr_regex)");
|
|
|
- sql.Append("spr_regex,max(pr_detail)pr_detail,max(substr(pr_spec,0,20))pr_spec from stepproductrep left join product on pr_code=spr_fsoncode where ");
|
|
|
+ sql.Append("spr_regex,max(pr_detail)pr_detail,max(substr(pr_detail,0,20))pr_spec from stepproductrep left join product on pr_code=spr_fsoncode where ");
|
|
|
sql.Append("spr_bomversion='" + ms_bomversion.Text + "' and spr_craftcode='" + ms_craftcode.Text + "' and instr('" + ms_paststep + "',spr_stepcode)>0 ");
|
|
|
sql.Append("And spr_mothercode ='" + ma_prodcode.Text + "' and spr_tracekind=1 and nvl(pr_prodtype,' ')<>'包装物料' and not exists(select 1 from craftmaterial where ");
|
|
|
sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_makecode='" + ma_code.Text + "' and cm_spid=");
|
|
|
@@ -580,6 +580,7 @@ namespace UAS_MES_NEW.Make
|
|
|
SPID.Add(sp_id);
|
|
|
OperateResult.AppendText(">>物料" + sp_soncode + "采集成功,条码" + code.Text + "\n", Color.Green);
|
|
|
LabelDataGridView.Rows[RemainIndex].Cells["BarCode"].Value = code.Text;
|
|
|
+ LabelDataGridView.Rows[RemainIndex].Cells["BarCode"].Style.BackColor = Color.Green;
|
|
|
LabelDataGridView.Rows[RemainIndex].Cells["sp_sntype"].Value = sp_sntype;
|
|
|
if (code.Text.Length > 80)
|
|
|
OperateResult.AppendText(">>采集条码" + code.Text + "程度超过长度限制80，内容截取前80位进行采集\n", Color.Red);
|
callm