From acd8429c81828ec55d2247a921639d9c71a40bba Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 11 Jun 2024 00:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=94=80=E5=94=AE=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=9A=84=E9=87=87=E8=B4=AD=E4=BB=B7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=BB=E5=8A=A8=E5=B9=B3=E5=9D=87=E4=BB=B7=E7=9A=84?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/datasource/mappers/MaterialCurrentStockMapperEx.java | 2 ++
 .../java/com/jsh/erp/service/depotItem/DepotItemService.java | 5 ++++-
 .../resources/mapper_xml/MaterialCurrentStockMapperEx.xml    | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java
index f0cba59f3..2586782d1 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java
@@ -17,4 +17,6 @@ public interface MaterialCurrentStockMapperEx {
     void updateUnitPriceByMId(
             @Param("currentUnitPrice") BigDecimal currentUnitPrice,
             @Param("materialId") Long materialId);
+
+    BigDecimal getCurrentUnitPriceByMId(@Param("materialId") Long materialId);
 }
\ No newline at end of file
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 9be070a54..a944c7d74 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
@@ -578,7 +578,10 @@ public class DepotItemService {
                     BusinessConstants.SUB_TYPE_SALES_RETURN.equals(depotHead.getSubType()) ||
                     BusinessConstants.SUB_TYPE_RETAIL.equals(depotHead.getSubType()) ||
                     BusinessConstants.SUB_TYPE_RETAIL_RETURN.equals(depotHead.getSubType())) {
-                    depotItem.setPurchaseUnitPrice(materialExtend.getPurchaseDecimal());
+                    boolean moveAvgPriceFlag = systemConfigService.getMoveAvgPriceFlag();
+                    BigDecimal currentUnitPrice = materialCurrentStockMapperEx.getCurrentUnitPriceByMId(materialExtend.getMaterialId());
+                    BigDecimal unitPrice = moveAvgPriceFlag? currentUnitPrice: materialExtend.getPurchaseDecimal();
+                    depotItem.setPurchaseUnitPrice(unitPrice);
                     if(StringUtil.isNotEmpty(depotItem.getBatchNumber())) {
                         depotItem.setPurchaseUnitPrice(getDepotItemByBatchNumber(depotItem.getMaterialExtendId(),depotItem.getBatchNumber()).getUnitPrice());
                     }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml
index d068cb71c..70373c615 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml
@@ -27,4 +27,8 @@
         and ifnull(delete_flag,'0') !='1'
     </update>
 
+    <select id="getCurrentUnitPriceByMId" resultType="java.math.BigDecimal">
+        select ifnull(mcs.current_unit_price,0) as current_unit_price from jsh_material_current_stock mcs where mcs.material_id=#{materialId} limit 1
+    </select>
+
 </mapper>
\ No newline at end of file