From db479d6874ea2db6f0588b961521cd0aa9d242b4 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 5 Aug 2025 22:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=A1=E7=A0=81=E8=8E=B7=E5=8F=96=E5=8D=95=E4=BB=B7?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/controller/MaterialController.java     | 10 +++++++++-
 .../main/java/com/jsh/erp/service/MaterialService.java |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index 6dcb3b63..6feba05a 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -613,7 +613,7 @@ public class MaterialController extends BaseController {
                             || "PDLR".equals(prefixNo) || "PDFP".equals(prefixNo)) {
                         //采购价-给录入界面按权限屏蔽
                         mvo.setBillPrice(roleService.parseBillPriceByLimit(mvo.getPurchaseDecimal(), "buy", priceLimit, request));
-                    } if ("XSDD".equals(prefixNo) || "XSCK".equals(prefixNo) || "XSTH".equals(prefixNo) || "QTCK".equals(prefixNo)) {
+                    } else if ("XSDD".equals(prefixNo) || "XSCK".equals(prefixNo) || "XSTH".equals(prefixNo) || "QTCK".equals(prefixNo)) {
                         //销售价
                         if(organId == null) {
                             mvo.setBillPrice(mvo.getWholesaleDecimal());
@@ -631,6 +631,14 @@ public class MaterialController extends BaseController {
                         if("QTCK".equals(prefixNo)) {
                             mvo.setBillPrice(roleService.parseBillPriceByLimit(mvo.getWholesaleDecimal(), "sale", priceLimit, request));
                         }
+                    } else if ("other".equals(prefixNo)) {
+                        //其它需要填充商品采购价或者成本价的场景
+                        if(systemConfigService.getMoveAvgPriceFlag()) {
+                            BigDecimal currentUnitPrice = materialService.getCurrentUnitPriceByMaterialId(mvo.getId());
+                            mvo.setBillPrice(currentUnitPrice);
+                        } else {
+                            mvo.setBillPrice(mvo.getPurchaseDecimal());
+                        }
                     }
                     //仓库id
                     if (depotId == null) {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
index da0bf060..68d696ba 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
@@ -1470,6 +1470,10 @@ public class MaterialService {
         return materialMapperEx.getMaterialExtendBySerialNumber(serialNumber);
     }
 
+    public BigDecimal getCurrentUnitPriceByMaterialId(Long materialId) {
+        return materialCurrentStockMapperEx.getCurrentUnitPriceByMId(materialId);
+    }
+
     /**
      * 构造多属性数组字符串
      * @param obj