|
|
@@ -1460,7 +1460,7 @@ public class MESServiceImpl implements MESService {
|
|
|
if ("已结案".equals(StringUtil.nvl(data1[2], ""))){
|
|
|
return ApiResponse.failRsp("10041", requestId, "工单:"+macode+"在ERP已结案,不允许领料!");
|
|
|
}
|
|
|
- if ("已完工".equals(StringUtil.nvl(data1[3], ""))){
|
|
|
+ if ("已完工".equals(StringUtil.nvl(data1[3], ""))&&!baseDao.isDBSetting("Make!Base","allowChangeAfterCom")){
|
|
|
return ApiResponse.failRsp("10041", requestId, "工单:"+macode+"在ERP已完工,不允许领料!");
|
|
|
}
|
|
|
ma_tasktype = StringUtil.nvl(data1[0], "");
|