diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmArrivalNoticeController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmArrivalNoticeController.java index 3e23224..34a97fb 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmArrivalNoticeController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmArrivalNoticeController.java @@ -120,6 +120,18 @@ public class WmArrivalNoticeController extends BaseController if(CollectionUtils.isEmpty(lines)){ return AjaxResult.error("请添加到货物资!"); } + + //这里进行判断,待收货物资是否需要检验,如果没有需要检验的则直接将状态更改为待入库 + boolean needCheck = false; + for(WmArrivalNoticeLine line:lines){ + if(line.getIqcCheck() == UserConstants.YES){ + needCheck = true; + break; + } + } + if(!needCheck){ + wmArrivalNotice.setStatus(UserConstants.ORDER_STATUS_APPROVED); + } } return toAjax(wmArrivalNoticeService.updateWmArrivalNotice(wmArrivalNotice)); }