From 9be10625a9f60c2095377727c810858e7193ac1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 7 Oct 2022 19:13:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=9B=B6=E5=94=AE=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=B2=A1=E6=9C=89=E8=B5=8B=E5=80=BC=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E4=BB=B7=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/mappers/DepotItemMapperEx.java  |  3 +++
 .../service/depotItem/DepotItemService.java    | 18 +++++++++---------
 .../resources/mapper_xml/DepotItemMapperEx.xml |  9 +++++++++
 3 files changed, 21 insertions(+), 9 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 5bbbd6e8..2d8cd7ce 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
@@ -183,4 +183,7 @@ public interface DepotItemMapperEx {
     Long getCountByMaterialAndBatchNumber(
             @Param("meId") Long meId,
             @Param("batchNumber") String batchNumber);
+
+    List<DepotItem> getDepotItemByBatchNumber(
+            @Param("batchNumber") String batchNumber);
 }
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 7a084d09..cdcbe7d9 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
@@ -525,9 +525,11 @@ public class DepotItemService {
                         }
                     }
                 }
-                //如果是销售出库单则给采购单价字段赋值（如果是批次商品，则要根据批号去找之前的采购价）
-                if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType()) &&
-                    BusinessConstants.SUB_TYPE_SALES.equals(depotHead.getSubType())) {
+                //如果是销售出库、销售退货、零售出库、零售退货则给采购单价字段赋值（如果是批次商品，则要根据批号去找之前的入库价）
+                if(BusinessConstants.SUB_TYPE_SALES.equals(depotHead.getSubType()) ||
+                    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());
                     if(StringUtil.isNotEmpty(depotItem.getBatchNumber())) {
                         depotItem.setPurchaseUnitPrice(getDepotItemByBatchNumber(depotItem.getBatchNumber()).getUnitPrice());
@@ -707,14 +709,12 @@ public class DepotItemService {
      * @return
      */
     public DepotItem getDepotItemByBatchNumber(String batchNumber) {
-        DepotItem depotItem = new DepotItem();
-        DepotItemExample example = new DepotItemExample();
-        example.createCriteria().andBatchNumberEqualTo(batchNumber).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        List<DepotItem> depotItemList = depotItemMapper.selectByExample(example);
+        List<DepotItem> depotItemList = depotItemMapperEx.getDepotItemByBatchNumber(batchNumber);
         if(null != depotItemList && depotItemList.size() > 0){
-            depotItem = depotItemList.get(0);
+            return depotItemList.get(0);
+        } else {
+            return new DepotItem();
         }
-        return depotItem;
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index f06ad9e0..058663b2 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -742,4 +742,13 @@
         and di.material_extend_id=#{meId}
         and di.batch_number=#{batchNumber}
     </select>
+
+    <select id="getDepotItemByBatchNumber" resultType="com.jsh.erp.datasource.entities.DepotItem">
+        select di.* from jsh_depot_head dh
+        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.batch_number = #{batchNumber}
+        and dh.type = '入库'
+    </select>
 </mapper>