From 1db008e039364420b1b09eea3fe8ff938a402d02 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 10 Jan 2025 11:59:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=AF=E7=94=A8=E5=8D=95=E5=93=81?= =?UTF-8?q?=E7=A7=8D=E6=A7=BD=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 06fdda736..37fc74fd3 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -123,6 +123,9 @@ public class IoCodeTempController extends BaseController { @Resource IoCollectSetService collectSetService; + @Resource + SysWorkplaceFreightService sysWorkplaceFreightService; + /** * PDA-----单据上传 @@ -1732,13 +1735,16 @@ public class IoCodeTempController extends BaseController { } } else { //判断产品是否已经绑定其他槽位 -// SysWorkplaceQueue workplaceQueue1 = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getRelId, udiRelevanceResponse.getId())); -// if (workplaceQueue1 != null) { -// if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) { -//// orderService.deleteByBillNo(orderId); -// return ResultVOUtils.error(507, "当前产品已绑定在" + workplaceQueue1.getCode() + "取货槽"); -// } -// } + SysWorkplaceQueue workplaceQueue1 = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getRelId, udiRelevanceResponse.getId())); + String freightCode = workplaceQueue1.getFreightCode(); + SysWorkplaceFreight one = sysWorkplaceFreightService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceFreight::getCode,freightCode)); + Integer isSingQueue = one.getIsSingQueue(); + if (workplaceQueue1 != null && isSingQueue == 1) { + if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) { +// orderService.deleteByBillNo(orderId); + return ResultVOUtils.error(507, "当前货架已启用单品种槽位且产品已绑定在" + workplaceQueue1.getCode() + "取货槽"); + } + } } } else { return ResultVOUtils.error(500, "取货槽位不存在!");