|
|
@@ -2127,16 +2127,16 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
err = "";
|
|
|
//条码不在维护范围内
|
|
|
List<String> sqls = new ArrayList<>();
|
|
|
- Object maincode = list.get(0).get("sncode");
|
|
|
+ String maincode = list.get(0).get("sncode").toString();
|
|
|
for (Map<Object, Object> m : list) {
|
|
|
- SqlRowList rs1 = baseDao.queryForRowSet("select * from MAKESNRULEDETAIL where msd_makecode=? and msd_sncode=? and msd_type='before'", macode, m.get("sncode"));
|
|
|
+ SqlRowList rs1 = baseDao.queryForRowSet("select * from MAKESNRULEDETAIL where msd_makecode=? and msd_sncode=? and msd_type='before'", macode, m.get("sncode").toString());
|
|
|
if (!rs1.next()) {
|
|
|
err += m.get("sncode") + ",";
|
|
|
}
|
|
|
if("".equals(err)) {
|
|
|
if((Integer) combineqty>1) {
|
|
|
sqls.add("insert into smtbind(SB_ID, SB_MAINCODE, SB_BARCODE, SB_PRODCODE, SB_INMAN, SB_INDATE, SB_STATUS, SB_MAKECODE)" +
|
|
|
- " values (smtbind_seq.nextval,'" + maincode + "','" + m.get("sncode") + "','" + rs.getString("ma_prodcode") + "','接口',sysdate,0,'" + macode + "')");
|
|
|
+ " values (smtbind_seq.nextval,'" + maincode + "','" + m.get("sncode").toString() + "','" + rs.getString("ma_prodcode") + "','接口',sysdate,0,'" + macode + "')");
|
|
|
}
|
|
|
sqls.add("update MAKESNRULEDETAIL set msd_isget=-1,msd_getdate=sysdate where msd_makecode='" + macode + "' and msd_sncode='"+m.get("sncode")+"' and nvl(msd_isget,0)=0 and msd_type='before'");
|
|
|
sqls.add("update MAKESNRULEDETAIL set msd_isconfirm=-1,msd_confirmdate=sysdate where msd_makecode='" + macode + "' and msd_sncode='"+m.get("sncode")+"' and msd_type='before' ");;
|