|
|
@@ -1139,12 +1139,16 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String iSN="";
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
String oErrMessage;
|
|
|
+ String iResCode="";
|
|
|
if(map.get("iErrCode")!=null){
|
|
|
iErrCode=map.get("iErrCode").toString();
|
|
|
}
|
|
|
if(map.get("iSN")!=null){
|
|
|
iSN=map.get("iSN").toString();
|
|
|
}
|
|
|
+ if(map.get("iResCode")!=null){
|
|
|
+ iResCode=map.get("iResCode").toString();
|
|
|
+ }
|
|
|
SqlRowList rs=baseDao.queryForRowSet("select ms_sncode,ms_makecode,ms_status,ms_outboxcode from makeserial where ms_sncode='"+iSN+"' order by ms_id desc");
|
|
|
if(rs.next()){
|
|
|
|
|
|
@@ -1165,7 +1169,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
sql.setLength(0);
|
|
|
sql.append("insert into 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(",ma_code,ms_code,ms_sncode,'',sysdate,'','','" + BadCode[i] + "','',");
|
|
|
+ sql.append(",ma_code,ms_code,ms_sncode,'',sysdate,'','"+iResCode+"','" + BadCode[i] + "','',");
|
|
|
sql.append("'',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
|
|
|
sql.append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
|
|
|
baseDao.execute(sql.toString());
|
callm