From 3fb0422a2bf42d573ffc2c9245793056722f2ff2 Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 6 Dec 2024 10:10:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E9=9B=B6=E5=BA=93=E5=AD=98=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9C=89=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoCollectOrderCodeManController.java | 2 +- .../collect/IoCollectOrderCodeManService.java | 2 +- .../api/service/inout/IoAddInoutService.java | 28 +++++++++++-------- .../service/inout/IoSplitFifoInvService.java | 18 ++++++------ 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 59e7b74dc..4ce3076d7 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -122,7 +122,7 @@ public class IoCollectOrderCodeManController extends BaseController { } } else { - return ResultVOUtils.error(500, e.getMessage()); + return ResultVOUtils.error(e.getCode(), e.getMessage()); } } } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 45acd6412..1746a5a5d 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -538,7 +538,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl ioSplitCodeEntities = splitCodeService.findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), workPlaceCode); for (IoSplitCodeEntity ioSplitCodeEntity : ioSplitCodeEntities) { - if (IntUtil.value(ioSplitCodeEntity.getRemainCount()) > needCount) { + if (IntUtil.value(ioSplitCodeEntity.getRemainCount()) >= needCount) { return true; } } diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 9e8250bc0..b9beeedcc 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -170,26 +170,30 @@ public class IoAddInoutService { } //产品是否指定供应商 - if (StrUtil.isEmpty(warehouseEntity.getSupId())) { - orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); - orderEntity.setUpdateTime(new Date()); - orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "未指定供应商！"); - orderService.update(orderEntity); - return ResultVOUtils.error(orderEntity.getErrMsg()); - } - //校验是否是当前供应商 - if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { - UdiRlSupEntity udiRlSupEntity = udiRlSupService.findByUdiRlIdUnitFk(warehouseEntity.getRelId() + "", orderEntity.getFromCorp()); - if (udiRlSupEntity == null) { + + if (!(bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT))) { + if (StrUtil.isEmpty(warehouseEntity.getSupId())) { orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); orderEntity.setUpdateTime(new Date()); - orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "当前供应商不存在此配送产品"); + orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "未指定供应商！"); orderService.update(orderEntity); return ResultVOUtils.error(orderEntity.getErrMsg()); } + //校验是否是当前供应商 + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + UdiRlSupEntity udiRlSupEntity = udiRlSupService.findByUdiRlIdUnitFk(warehouseEntity.getRelId() + "", orderEntity.getFromCorp()); + if (udiRlSupEntity == null) { + orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); + orderEntity.setUpdateTime(new Date()); + orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "当前供应商不存在此配送产品"); + orderService.update(orderEntity); + return ResultVOUtils.error(orderEntity.getErrMsg()); + } + } } + //产品是否可以以使用单元入库 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(warehouseEntity.getRelId()); if (udiRelevanceResponse == null) { diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java index 85209ddca..d374a504e 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java @@ -89,7 +89,8 @@ public class IoSplitFifoInvService extends ServiceImpl queues = sysWorkplaceQueueService.list(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getWorkPlaceIdFk, workPlaceCode)); - if (queues.size() == 0){ - throw new JsonException(500,"请增加取货槽"); + if (queues.size() == 0) { + throw new JsonException(500, "请增加取货槽"); } SysWorkplaceQueue workplaceQueue = queues.get(0); // 使用流来过滤掉匹配的元素 @@ -181,11 +183,11 @@ public class IoSplitFifoInvService extends ServiceImpl queue1.getCode().compareTo(queue2.getCode())) .collect(Collectors.toList()); - if (filteredQueues.size() > 0){ + if (filteredQueues.size() > 0) { //还有剩余的槽位 可分配 SysWorkplaceQueue sysWorkplaceQueue = filteredQueues.get(0); return sysWorkplaceQueue.getCode(); - }else { + } else { //增加一个槽位 SysWorkplaceLayer layer = sysWorkplaceLayerService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceLayer::getCode, workplaceQueue.getLayerCode())); SysWorkplaceLayerRequest sysWorkplaceLayerRequest = new SysWorkplaceLayerRequest(); @@ -195,7 +197,7 @@ public class IoSplitFifoInvService extends ServiceImpl