|
@@ -1127,11 +1127,13 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("msl_sncode",rs.getString("msl_sncode"));
|
|
rmap.put("msl_sncode",rs.getString("msl_sncode"));
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}
|
|
}
|
|
|
- rs=baseDao.queryForRowSet("select msl_sncode,msl_id from "+Master+".makesnlist where msl_makecode='"+iMakecode+"' and msl_type='after' and nvl(msl_status,0)=0 order by msl_sncode");
|
|
|
|
|
- if(rs.next()){
|
|
|
|
|
- String msl_id=rs.getString("msl_id");
|
|
|
|
|
- String msl_sncode=rs.getString("msl_sncode");
|
|
|
|
|
- baseDao.execute("update "+Master+".makesnlist set msl_status=-1,msl_beforesn='"+iSN+"' where msl_id="+msl_id+" and nvl(msl_status,0)=0");
|
|
|
|
|
|
|
+ List<String> list = new ArrayList<String>();
|
|
|
|
|
+ list = baseDao.callProcedureWithOut(Master+".SP_GETPSN", new Object[]{
|
|
|
|
|
+ String.valueOf(iSN),
|
|
|
|
|
+ String.valueOf(iMakecode),
|
|
|
|
|
+ }, new Integer[]{1,2}, new Integer[]{3});
|
|
|
|
|
+ String msl_sncode=list.get(2);
|
|
|
|
|
+ if(msl_sncode!=null){
|
|
|
rmap.put("msl_sncode",msl_sncode);
|
|
rmap.put("msl_sncode",msl_sncode);
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}else{
|
|
}else{
|