|
|
@@ -636,7 +636,11 @@ public class MakePrepareServiceImpl implements MakePrepareService {
|
|
|
mpMap.put("send", isProd);
|
|
|
mpMap.put("user", "system");
|
|
|
mpMap.put("color", 3);
|
|
|
- mpMap.put("orderid", mpCode);
|
|
|
+ if(times==1) {
|
|
|
+ mpMap.put("orderid", mpCode);
|
|
|
+ }else {
|
|
|
+ mpMap.put("orderIDByHand", mpCode);
|
|
|
+ }
|
|
|
mpMap.put("orderName", mpCode);
|
|
|
mpMap.put("matList", matList);
|
|
|
String sendMpList = JSON.toJSONString(mpMap);
|
|
|
@@ -695,7 +699,7 @@ public class MakePrepareServiceImpl implements MakePrepareService {
|
|
|
//更新主表备料状态
|
|
|
baseDao.execute("update MakePrepare set mp_pstatus = '待领料',mp_getdate=sysdate where mp_id = "+id
|
|
|
+ " and exists (select 1 from makePreparedetail where md_barcode is not null and md_mpid = mp_id and nvl(md_status,' ') <> '已领料' )");
|
|
|
- baseDao.execute(baseDao.logger.getMessageLog("获取料卷号", "获取成功", "MakePrepare2", "mp_id", id).getSql());
|
|
|
+ baseDao.execute(baseDao.logger.getMessageLog("获取料卷号", "获取成功"+times, "MakePrepare2", "mp_id", id).getSql());
|
|
|
}
|
|
|
}else{
|
|
|
BaseUtil.showErrorOnSuccess("获取备料信息为空!");
|
