From 8c5baf4b5f3e06df5d2613b93bec74271b41985f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= Date: Wed, 27 Nov 2024 15:20:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=96=B0=E5=A2=9E=E6=96=99=E7=AE=B1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktg/mes/wm/controller/UcmCtBaseController.java | 5 +++++ .../com/ktg/mes/wm/service/IUcmCtBaseService.java | 2 ++ .../mes/wm/service/impl/UcmCtBaseServiceImpl.java | 12 ++++++++++++ 3 files changed, 19 insertions(+) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/UcmCtBaseController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/UcmCtBaseController.java index dca9cc2..93f9324 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/UcmCtBaseController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/UcmCtBaseController.java @@ -91,6 +91,11 @@ public class UcmCtBaseController extends BaseController { } } + @PostMapping("/open/add") + public String openAdd(@RequestBody UcmCtBase ucmCtBase) { + return ucmCtBaseService.addUcmCtBase(ucmCtBase); + } + /** * 查询料箱管理列表 */ diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IUcmCtBaseService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IUcmCtBaseService.java index 8eb6a19..dc13eb2 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IUcmCtBaseService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IUcmCtBaseService.java @@ -71,4 +71,6 @@ public interface IUcmCtBaseService String uploadTempBoxListInfo(List rfidCardList); String uploadTempBoxItemListInfo(List rfidCardList); + + String addUcmCtBase(UcmCtBase ucmCtBase); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/UcmCtBaseServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/UcmCtBaseServiceImpl.java index 0e74434..249f295 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/UcmCtBaseServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/UcmCtBaseServiceImpl.java @@ -262,4 +262,16 @@ public class UcmCtBaseServiceImpl implements IUcmCtBaseService { System.out.println("=============================================="); return "OK"; } + + @Override + public String addUcmCtBase(UcmCtBase ucmCtBase) { + UcmCtBase ucmCtBaseQuery = new UcmCtBase(); + ucmCtBaseQuery.setCode(ucmCtBase.getCode()); + if (!ucmCtBaseMapper.selectUcmCtBaseList(ucmCtBaseQuery).isEmpty()) + return "新增失败，该料箱已经存在"; + ucmCtBase.setCreateTime(DateUtils.getNowDate()); + ucmCtBase.setCreateBy(getUserName()); + ucmCtBaseMapper.insertUcmCtBase(ucmCtBase); + return "OK"; + } } From a517e613986471e43d263e2d742ad4f66acba66c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= Date: Thu, 28 Nov 2024 10:17:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E6=94=BE=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ktg/mes/md/controller/WmsOutTaskController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java index 33cee91..489b172 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java @@ -40,6 +40,11 @@ public class WmsOutTaskController extends BaseController { return getDataTable(list); } + @PutMapping("/open/run/{wmsOutTaskIds}") + public AjaxResult openRun(@PathVariable Long[] wmsOutTaskIds) { + return toAjax(wmsOutTaskService.runWmsOutTask(wmsOutTaskIds)); + } + /** * 查询出库任务列表 */