From c2f757a7ac957fcd14088c7e4362003c1344a49d Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 4 Jun 2024 23:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=9B=E9=94=80=E5=AD=98?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E7=9A=84=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
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 0da73135..fd7903de 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
@@ -377,7 +377,11 @@ public class DepotItemController {
                     } else {
                         item.put("unitPrice", diEx.getPurchaseDecimal());
                     }
-                    item.put("thisAllPrice", thisSum.multiply(diEx.getPurchaseDecimal()));
+                    if(moveAvgPriceFlag) {
+                        item.put("thisAllPrice", thisSum.multiply(diEx.getCurrentUnitPrice()));
+                    } else {
+                        item.put("thisAllPrice", thisSum.multiply(diEx.getPurchaseDecimal()));
+                    }
                     dataArray.add(item);
                 }
             }