From 0588f1be66f78fc53f150fce2d3dec3e84e581c6 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Sun, 13 Apr 2025 23:04:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=88=90=E6=9C=AC=E4=BB=B7?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=9A=84bug=EF=BC=9A=E6=9C=AA=E6=8A=8A?= =?UTF-8?q?=E7=BB=84=E8=A3=85=E3=80=81=E6=8B=86=E5=8D=B8=E3=80=81=E5=A4=8D?= =?UTF-8?q?=E7=9B=98=E8=AE=A1=E7=AE=97=E8=BF=9B=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/erp/service/DepotItemService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java index a1aebdd8..56e8409c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java @@ -1107,11 +1107,19 @@ public class DepotItemService { currentUnitPrice = item.getUnitPrice(); } } else { - currentNumber = currentNumber.add(basicNumber); //数量*当前的成本单价 + currentNumber = currentNumber.add(basicNumber); currentAllPrice = currentAllPrice.add(basicNumber.multiply(currentUnitPrice)); } } + //特殊情况:1-组装单 2-拆卸单 3-盘点复盘 + if(BusinessConstants.SUB_TYPE_ASSEMBLE.equals(item.getSubType())|| + BusinessConstants.SUB_TYPE_DISASSEMBLE.equals(item.getSubType())|| + BusinessConstants.SUB_TYPE_REPLAY.equals(item.getSubType())) { + //数量*当前的成本单价 + currentNumber = currentNumber.add(basicNumber); + currentAllPrice = currentAllPrice.add(basicNumber.multiply(currentUnitPrice)); + } //防止单价金额溢出 if(currentUnitPrice.compareTo(BigDecimal.valueOf(100000000))>0 || currentUnitPrice.compareTo(BigDecimal.valueOf(-100000000))<0) { currentUnitPrice = BigDecimal.ZERO;