From 9ff1d99abf3934996b5b0723340dc81e72294764 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, 3 Jun 2022 00:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=BA=94=E6=94=B6=E5=BA=94=E4=BB=98?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A1=E7=AE=97=E9=87=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A2=E9=87=91=E5=AD=97=E6=AE=B5=EF=BC=8C=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java   | 6 ++++++
 .../com/jsh/erp/service/depotHead/DepotHeadService.java     | 5 +++++
 .../src/main/resources/mapper_xml/DepotHeadMapperEx.xml     | 6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
index 06c9c080..895db0a7 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
@@ -148,6 +148,12 @@ public interface DepotHeadMapperEx {
             @Param("subType") String subType,
             @Param("endTime") String endTime);
 
+    BigDecimal findDepositMoney(
+            @Param("supplierId") Integer supplierId,
+            @Param("type") String type,
+            @Param("subType") String subType,
+            @Param("endTime") String endTime);
+
     List<DepotHeadVo4List> getDetailByNumber(
             @Param("number") String number);
 
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 2caedc07..b3ac6079 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -580,11 +580,13 @@ public class DepotHeadService {
     public BigDecimal findAllMoney(Integer supplierId, String type, String subType, String mode, String endTime)throws Exception {
         String modeName = "";
         BigDecimal allOtherMoney = BigDecimal.ZERO;
+        BigDecimal allDepositMoney = BigDecimal.ZERO;
         if (mode.equals("实际")) {
             modeName = "change_amount";
         } else if (mode.equals("合计")) {
             modeName = "discount_last_money";
             allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime);
+            allDepositMoney = depotHeadMapperEx.findDepositMoney(supplierId, type, subType, endTime);
         }
         BigDecimal result = BigDecimal.ZERO;
         try{
@@ -595,6 +597,9 @@ public class DepotHeadService {
         if(allOtherMoney!=null) {
             result = result.add(allOtherMoney);
         }
+        if(allDepositMoney!=null) {
+            result = result.subtract(allDepositMoney);
+        }
         return result;
     }
 
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index a20140af..65c43ed6 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -534,6 +534,12 @@
         and ifnull(delete_flag,'0') !='1'
     </select>
 
+    <select id="findDepositMoney" resultType="java.math.BigDecimal">
+        select ifnull(sum(deposit),0) as allDepositMoney from jsh_depot_head where type=#{type} and sub_type = #{subType}
+        and organ_id =#{supplierId} and oper_time &lt;=#{endTime}
+        and ifnull(delete_flag,'0') !='1'
+    </select>
+
     <select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">
         select dh.*, concat(dh.sub_type,dh.type) as depotHeadType, a.name AccountName,
                s.supplier OrganName, s.contacts, s.telephone, s.address