From 952c8f38b0fbd75c438b35ce24c104a305773482 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Mon, 23 May 2022 00:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=85=A5=E5=BA=93=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktg/common/constant/UserConstants.java | 8 +++++++ .../wm/controller/WmItemRecptController.java | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java index 9bb9a64..2aff884 100644 --- a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java +++ b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java @@ -85,6 +85,14 @@ public class UserConstants public static final String TASK_CODE="TASK_CODE"; public static final String DEFECT_CODE = "DEFECT_CODE"; + /** + * 单据的状态类型 + */ + public static final String ORDER_STATUS_PREPAR="PREPARE"; + public static final String ORDER_STATUS_CONFIRMED="CONFIRMED"; + public static final String ORDER_STATUS_APPROVING="APPROVING"; + public static final String ORDER_STATUS_APPROVED="APPROVED"; + public static final String ORDER_STATUS_FINISHED="FINISHED"; /** * 维护类型 diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java index 096ab01..867b471 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java @@ -145,6 +145,27 @@ public class WmItemRecptController extends BaseController return toAjax(wmItemRecptService.updateWmItemRecpt(wmItemRecpt)); } + /** + * 执行入库 + * @return + */ + @PreAuthorize("@ss.hasPermi('mes:wm:itemrecpt:edit')") + @Log(title = "物料入库单", businessType = BusinessType.UPDATE) + @PutMapping("/{recptIds}") + public AjaxResult execute(@PathVariable Long[] recptIds){ + if(recptIds !=null && recptIds.length>0){ + for (Long id:recptIds + ) { + WmItemRecpt wmItemRecpt =wmItemRecptService.selectWmItemRecptByRecptId(id); + wmItemRecpt.setStatus(UserConstants.ORDER_STATUS_FINISHED); + wmItemRecptService.updateWmItemRecpt(wmItemRecpt); + } + + } + return AjaxResult.success(); + } + + /** * 删除物料入库单 */