From a5579a1b8601df5b9d7d5bc537cf51182eb15e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 22 May 2023 22:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99sku=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=A1=E7=AE=97=E5=A2=9E=E5=8A=A0=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E7=9A=84=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/mappers/DepotItemMapperEx.java |  7 +++++
 .../service/depotItem/DepotItemService.java   |  4 ++-
 .../mapper_xml/DepotItemMapperEx.xml          | 27 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

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 aabd8c77..53ac6431 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
@@ -132,6 +132,13 @@ public interface DepotItemMapperEx {
             @Param("creatorArray") String[] creatorArray,
             @Param("forceFlag") Boolean forceFlag);
 
+    BigDecimal getSkuStockCheckSumByDepotList(
+            @Param("depotList") List<Long> depotList,
+            @Param("meId") Long meId,
+            @Param("forceFlag") Boolean forceFlag,
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime);
+
     BigDecimal getStockCheckSumByDepotList(
             @Param("depotList") List<Long> depotList,
             @Param("mId") Long mId,
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 b8da39d8..9deed577 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
@@ -883,6 +883,8 @@ public class DepotItemService {
     public BigDecimal getSkuStockByParam(Long depotId, Long meId, String beginTime, String endTime) throws Exception {
         Boolean forceFlag = systemConfigService.getForceApprovalFlag();
         List<Long> depotList = depotService.parseDepotList(depotId);
+        //盘点复盘后数量的变动
+        BigDecimal stockCheckSum = depotItemMapperEx.getSkuStockCheckSumByDepotList(depotList, meId, forceFlag, beginTime, endTime);
         DepotItemVo4Stock stockObj = depotItemMapperEx.getSkuStockByParamWithDepotList(depotList, meId, forceFlag, beginTime, endTime);
         BigDecimal stockSum = BigDecimal.ZERO;
         if(stockObj!=null) {
@@ -897,7 +899,7 @@ public class DepotItemService {
             stockSum = inTotal.add(transfInTotal).add(assemInTotal).add(disAssemInTotal)
                     .subtract(outTotal).subtract(transfOutTotal).subtract(assemOutTotal).subtract(disAssemOutTotal);
         }
-        return stockSum;
+        return stockCheckSum.add(stockSum);
     }
 
     /**
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index a4b803d1..b3c54ae4 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -606,6 +606,33 @@
         and ifnull(di.delete_flag, '0') != '1') tb
     </select>
 
+    <select id="getSkuStockCheckSumByDepotList"  resultType="java.math.BigDecimal">
+        select ifnull(sum(di.basic_number),0) stockCheckSum from jsh_depot_head dh
+        left JOIN jsh_depot_item di on dh.id=di.header_id
+        where 1=1
+        <if test="meId != null">
+            and di.material_extend_id=#{meId}
+        </if>
+        and dh.sub_type='盘点复盘'
+        <if test="depotList.size()>0">
+            and di.depot_id in
+            <foreach collection="depotList" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="forceFlag">
+            and dh.status = '1'
+        </if>
+        <if test="beginTime != null">
+            and dh.oper_time &gt;= #{beginTime}
+        </if>
+        <if test="endTime != null">
+            and dh.oper_time &lt;= #{endTime}
+        </if>
+        and ifnull(dh.delete_flag,'0') !='1'
+        and ifnull(di.delete_flag,'0') !='1'
+    </select>
+
     <select id="getStockCheckSumByDepotList"  resultType="java.math.BigDecimal">
         select ifnull(sum(di.basic_number),0) stockCheckSum from jsh_depot_head dh
         left JOIN jsh_depot_item di on dh.id=di.header_id