|
|
@@ -1780,7 +1780,9 @@ public class MESServiceImpl implements MESService {
|
|
|
return ApiResponse.failRsp("10072", requestId, "出货通知单不是已审核状态,无法确认!");
|
|
|
}
|
|
|
if (baseDao.checkIf("SendNotify", "sn_sendstatus='已出库' and sn_id=" + snId)) {
|
|
|
- return ApiResponse.failRsp("10073", requestId, "出货通知单已出货,无需重新确认生成!");
|
|
|
+ String inoutno = StringUtil.nvl(baseDao.getFieldDataByCondition("prodiodetail", "pd_inoutno", "pd_piclass='出货单' and pd_orderid=" + sndId), "");
|
|
|
+ return ApiResponse.successRsp("0", requestId, "出货单:" + inoutno + ",请在ERP查看!");
|
|
|
+ //return ApiResponse.failRsp("10073", requestId, "出货通知单已出货,无需重新确认生成!");
|
|
|
}
|
|
|
if (baseDao.checkIf("ProdIODetail", "pd_piclass='出货单' and pd_orderid=" + sndId)) {
|
|
|
return ApiResponse.failRsp("10074", requestId, "出货通知单已转出货单,无需重新确认生成!");
|