From 9d99ccb32284b1e5739c3546b8bd8282c3310aea Mon Sep 17 00:00:00 2001 From: yewj Date: Sat, 9 Nov 2024 16:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E9=9B=B6=E6=95=B0=E9=87=8F=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoSplitController.java | 5 +---- .../com/glxp/api/service/inout/IoSplitCodeService.java | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index 5df870477..566f4a927 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -143,10 +143,7 @@ public class IoSplitController extends BaseController { if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) { collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode()); splitCodeService.preAutoTagCode(collectOrder); -// //未拆零 -// if (IntUtil.value(collectOrder.getSplitStatus()) != 2) { -// splitCodeService.orderAutoTagCode(collectOrder); -// } + collectOrderService.updateById(collectOrder); return ResultVOUtils.success("后台已开始赋码，请稍后刷新查看"); } else { return ResultVOUtils.success("无需自动赋码"); diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index af5190791..3b2a903cc 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -439,6 +439,13 @@ public class IoSplitCodeService extends ServiceImpl 0) { splitRemove(collectOrderBiz, collectOrder, putWorkPlaceCode); } + if (collectOrderBiz.getTagStatus() == 2) { + throw new JsonException(500, "确认失败，工位库存数量不足！"); + } else { + collectOrderBiz.setGetConfirm(true); + collectOrderBizService.updateById(collectOrderBiz); + } + }