From 8905ea8ca4273a124abae4fc357a806ecbc11ad5 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 6 Mar 2023 17:38:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=80=97=E6=9D=90=EF=BC=8C?= =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/basic/UdiRelevanceController.java | 1 + .../api/controller/inout/IoCodeTempController.java | 2 +- .../inv/impl/InvMAOrderDetailServiceImpl.java | 12 ++++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index b552898af..e8354b6e0 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -307,6 +307,7 @@ public class UdiRelevanceController { udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch()); udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire()); udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct()); + udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum()); udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1()); udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2()); udiProductEntity.setBasicPrductRemak3(udiRelevanceSaveRequest.getBasicPrductRemak3()); 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 0b457109b..1af89aeed 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -795,7 +795,7 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); } else { //查询此单据已扫描的条码数量 - if (codeTempEntity.getMyReCount() >= count) { + if (codeTempEntity.getMyReCount() > count) { return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java index 183553ba3..30f8b5bba 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java @@ -61,17 +61,25 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { //查询养护说明 InvMAExplanationEntity invMAExplanationEntity = invMAExplanationDao.selectByStatus(1); + + //查询养护记录信息 + InvMAOrderEntity maOrder = invMAOrderDao.selectOne(new QueryWrapper().eq("orderId", invMAOrderDetailEntity.getOrderIdFk())); + if (null != maintenanceOrderDetailEntity) { if (StrUtil.isBlank(udi.getSerialNo()) || (StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo()))) { + //查询库存数量，判断盘点数量是否超出库存数量 + InvProductEntity invProductEntity = invProductDao.selectProductInfo(maintenanceOrderDetailEntity.getRelId(), maintenanceOrderDetailEntity.getBatchNo(), null, maOrder.getInvCode(), maOrder.getInvSpaceCode()); maintenanceOrderDetailEntity.setCount(maintenanceOrderDetailEntity.getCount() + 1); + if (null != invProductEntity && maintenanceOrderDetailEntity.getCount() > invProductEntity.getReCount()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "超出库存结余数量！"); + } maintenanceOrderDetailEntity.setUpdateTime(new Date()); invMAOrderDetailDao.updateById(maintenanceOrderDetailEntity); } else { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复！"); } } else { - //查询养护记录信息 - InvMAOrderEntity maOrder = invMAOrderDao.selectOne(new QueryWrapper().eq("orderId", invMAOrderDetailEntity.getOrderIdFk())); + //查询此产品库存详情是否存在 FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setCode(invMAOrderDetailEntity.getCode());