From 66d3ffd0d0df55301d6a816eeea12f54b68244bb Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Wed, 11 Feb 2026 17:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E5=8D=95=E6=8D=AE=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=99=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E5=B7=B2?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E7=9A=84=E9=87=91=E9=A2=9D=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/DepotItemController.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index f315984d..7edf71ec 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -215,6 +215,7 @@ public class DepotItemController {
                 BigDecimal totalAllPrice = BigDecimal.ZERO;
                 BigDecimal totalTaxMoney = BigDecimal.ZERO;
                 BigDecimal totalTaxLastMoney = BigDecimal.ZERO;
+                BigDecimal totalFinishNumber = BigDecimal.ZERO;
                 BigDecimal totalWeight = BigDecimal.ZERO;
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
                     JSONObject item = new JSONObject();
@@ -252,7 +253,8 @@ public class DepotItemController {
                     item.put("operNumber", diEx.getOperNumber());
                     item.put("basicNumber", diEx.getBasicNumber());
                     item.put("preNumber", diEx.getOperNumber()); //原数量
-                    item.put("finishNumber", depotItemService.getFinishNumber(diEx.getMaterialExtendId(), diEx.getId(), diEx.getHeaderId(), unitInfo, materialUnit, linkType)); //已入库|已出库
+                    BigDecimal finishNumber = depotItemService.getFinishNumber(diEx.getMaterialExtendId(), diEx.getId(), diEx.getHeaderId(), unitInfo, materialUnit, linkType);
+                    item.put("finishNumber", finishNumber); //已入库|已出库
                     item.put("purchaseDecimal", roleService.parseBillPriceByLimit(diEx.getPurchaseDecimal(), billCategory, priceLimit, request));  //采购价
                     if("basic".equals(linkType) || "1".equals(isReadOnly)) {
                         //正常情况显示金额，而以销定购的情况不能显示金额
@@ -288,6 +290,7 @@ public class DepotItemController {
                     totalAllPrice = totalAllPrice.add(diEx.getAllPrice()==null?BigDecimal.ZERO:diEx.getAllPrice());
                     totalTaxMoney = totalTaxMoney.add(diEx.getTaxMoney()==null?BigDecimal.ZERO:diEx.getTaxMoney());
                     totalTaxLastMoney = totalTaxLastMoney.add(diEx.getTaxLastMoney()==null?BigDecimal.ZERO:diEx.getTaxLastMoney());
+                    totalFinishNumber = totalFinishNumber.add(finishNumber);
                     totalWeight = totalWeight.add(allWeight);
                 }
                 if(StringUtil.isNotEmpty(isReadOnly) && "1".equals(isReadOnly)) {
@@ -296,6 +299,7 @@ public class DepotItemController {
                     footItem.put("allPrice", roleService.parseBillPriceByLimit(totalAllPrice, billCategory, priceLimit, request));
                     footItem.put("taxMoney", roleService.parseBillPriceByLimit(totalTaxMoney, billCategory, priceLimit, request));
                     footItem.put("taxLastMoney", roleService.parseBillPriceByLimit(totalTaxLastMoney, billCategory, priceLimit, request));
+                    footItem.put("finishNumber", totalFinishNumber);
                     footItem.put("weight", totalWeight);
                     dataArray.add(footItem);
                 }