From 9e173e39b18e78299f52b97baf70161ff7e886cb Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 7 Apr 2024 15:20:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=90=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E6=89=B9=E5=8F=B7=E9=87=8D=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=87=87=E8=B4=AD=E4=BB=B7=E8=8E=B7=E5=8F=96=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/datasource/mappers/DepotItemMapperEx.java  | 1 +
 .../com/jsh/erp/service/depotItem/DepotItemService.java    | 7 ++++---
 .../src/main/resources/mapper_xml/DepotItemMapperEx.xml    | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
index 3acacb3f..5917f526 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
@@ -234,6 +234,7 @@ public interface DepotItemMapperEx {
             @Param("batchNumber") String batchNumber);
 
     List<DepotItem> getDepotItemByBatchNumber(
+            @Param("materialExtendId") Long materialExtendId,
             @Param("batchNumber") String batchNumber);
 
     List<MaterialVo4Unit> getBillItemByParam(
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 a577e1a1..12c038ea 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
@@ -585,7 +585,7 @@ public class DepotItemService {
                     BusinessConstants.SUB_TYPE_RETAIL_RETURN.equals(depotHead.getSubType())) {
                     depotItem.setPurchaseUnitPrice(materialExtend.getPurchaseDecimal());
                     if(StringUtil.isNotEmpty(depotItem.getBatchNumber())) {
-                        depotItem.setPurchaseUnitPrice(getDepotItemByBatchNumber(depotItem.getBatchNumber()).getUnitPrice());
+                        depotItem.setPurchaseUnitPrice(getDepotItemByBatchNumber(depotItem.getMaterialExtendId(),depotItem.getBatchNumber()).getUnitPrice());
                     }
                 }
                 if (StringUtil.isExist(rowObj.get("taxUnitPrice"))) {
@@ -771,11 +771,12 @@ public class DepotItemService {
 
     /**
      * 根据批号查询单据明细信息
+     * @param materialExtendId
      * @param batchNumber
      * @return
      */
-    public DepotItem getDepotItemByBatchNumber(String batchNumber) {
-        List<DepotItem> depotItemList = depotItemMapperEx.getDepotItemByBatchNumber(batchNumber);
+    public DepotItem getDepotItemByBatchNumber(Long materialExtendId, String batchNumber) {
+        List<DepotItem> depotItemList = depotItemMapperEx.getDepotItemByBatchNumber(materialExtendId, batchNumber);
         if(null != depotItemList && depotItemList.size() > 0){
             return depotItemList.get(0);
         } else {
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 431e7e4a..002d6e07 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -1003,6 +1003,7 @@
         left join jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1'
         where 1=1
         and ifnull(dh.delete_flag,'0') !='1'
+        and di.material_extend_id = #{materialExtendId}
         and di.batch_number = #{batchNumber}
         and dh.type = '入库'
     </select>