From fd057938b9f370828bfbbb4614d30cbfee0d3cec Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Thu, 14 Nov 2024 22:21:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=B9=E6=AC=A1=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=8F=88=E6=98=AF=E5=A4=9A=E5=8D=95=E4=BD=8D=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E9=80=80=E8=B4=A7=E9=81=87?= =?UTF-8?q?=E5=88=B0=E5=BA=93=E5=AD=98=E4=B8=8D=E8=B6=B3=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/service/depotItem/DepotItemService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index bc9cf7f8..cf1b2ce6 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -649,8 +649,12 @@ public class DepotItemService { stock = getOneBatchNumberStock(depotItem.getDepotId(), barCode, depotItem.getBatchNumber()); stockMsg += "-批号" + depotItem.getBatchNumber(); } - BigDecimal thisBasicNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber(); - if(!systemConfigService.getMinusStockFlag() && stock.compareTo(thisBasicNumber)<0){ + BigDecimal thisRealNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber(); + if(StringUtil.isNotEmpty(depotItem.getBatchNumber())) { + //对于批次商品，直接使用当前填写的数量 + thisRealNumber = depotItem.getOperNumber()==null?BigDecimal.ZERO:depotItem.getOperNumber(); + } + if(!systemConfigService.getMinusStockFlag() && stock.compareTo(thisRealNumber)<0){ throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE, String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG, stockMsg)); }