|
@@ -931,7 +931,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}
|
|
}
|
|
|
//之前有获取过的
|
|
//之前有获取过的
|
|
|
- SqlRowList rs=baseDao.queryForRowSet("select * from makeinfodet left join MakeRemark on MID_ORDERCODE=ordernumber " +
|
|
|
|
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select * from "+Master+".makeinfodet left join "+Master+".MakeRemark on MID_ORDERCODE=ordernumber " +
|
|
|
"left join aftersaledet on asd_sn=mid_sn left join DeliveryIn on DeliveryIn.sn=mid_sn " +
|
|
"left join aftersaledet on asd_sn=mid_sn left join DeliveryIn on DeliveryIn.sn=mid_sn " +
|
|
|
"left join Deliveryout on Deliveryout.sn=mid_sn left join remakedet on mid_sn=RMD_SN where mid_ordercode='"+iMakecode+"' and rownum=1");
|
|
"left join Deliveryout on Deliveryout.sn=mid_sn left join remakedet on mid_sn=RMD_SN where mid_ordercode='"+iMakecode+"' and rownum=1");
|
|
|
if(rs.next()){
|
|
if(rs.next()){
|
|
@@ -1047,7 +1047,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}
|
|
}
|
|
|
iSN=map.get("iSN").toString();
|
|
iSN=map.get("iSN").toString();
|
|
|
- String prcode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_prodcode","ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')").toString();
|
|
|
|
|
|
|
+ String prcode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_prodcode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')").toString();
|
|
|
SqlRowList rs=baseDao.queryForRowSet("select pid_item,pid_value from "+Master+".productitem left join "+Master+".productitemdetail on pi_id=pid_piid " +
|
|
SqlRowList rs=baseDao.queryForRowSet("select pid_item,pid_value from "+Master+".productitem left join "+Master+".productitemdetail on pi_id=pid_piid " +
|
|
|
"where pi_prodcode='"+prcode+"' and pid_item is not null");
|
|
"where pi_prodcode='"+prcode+"' and pid_item is not null");
|
|
|
while(rs.next()){
|
|
while(rs.next()){
|
|
@@ -1128,7 +1128,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
sql.append("insert into "+Master+".makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
|
|
sql.append("insert into "+Master+".makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
|
|
|
sql.append(",mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status) select '" + mb_id + "'");
|
|
sql.append(",mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status) select '" + mb_id + "'");
|
|
|
sql.append(",ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + CurrentStep + "','" + iSourceCode + "','" + BadCode[i] + "','',");
|
|
sql.append(",ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + CurrentStep + "','" + iSourceCode + "','" + BadCode[i] + "','',");
|
|
|
- sql.append("'" + BgCode + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
|
|
|
|
|
|
|
+ sql.append("'" + BgCode + "',sp_soncode,'0' from "+Master+".make left join "+Master+".makeSerial on ms_makecode=ma_code left join "+Master+".stepProduct on ");
|
|
|
sql.append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
|
|
sql.append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
|
|
|
baseDao.execute(sql.toString());
|
|
baseDao.execute(sql.toString());
|
|
|
}
|
|
}
|