From d70be28df7d09b9cc7669e56943e0d2f9a1a0bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 2 Mar 2023 21:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper_xml/DepotHeadMapperEx.xml          | 24 +++++++++++--------
 .../mapper_xml/DepotItemMapperEx.xml          | 12 ++++++----
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index eb567b53..6f2029a7 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -859,10 +859,12 @@
     </select>
 
     <select id="getBuyAndSaleBasicStatistics" resultType="java.math.BigDecimal">
-        SELECT
-        ifnull(sum(dh.discount_last_money),0)
-        FROM jsh_depot_head dh left join jsh_depot_item di on dh.id = di.header_id
-        WHERE 1=1
+        select
+        ifnull(sum(discount_last_money),0) from
+        (select distinct dh.id, dh.discount_last_money
+        from jsh_depot_head dh
+        left join jsh_depot_item di on dh.id = di.header_id
+        where 1=1
         and di.id is not null
         <if test="type != null">
             and dh.type=#{type}
@@ -890,14 +892,16 @@
             )
         </if>
         and ifnull(dh.delete_flag,'0') !='1'
-        and ifnull(di.delete_flag,'0') !='1'
+        and ifnull(di.delete_flag,'0') !='1') tb
     </select>
 
     <select id="getBuyAndSaleRetailStatistics" resultType="java.math.BigDecimal">
-        SELECT
-        ifnull(sum(dh.total_price),0)
-        FROM jsh_depot_head dh left join jsh_depot_item di on dh.id = di.header_id
-        WHERE 1=1
+        select
+        ifnull(sum(total_price),0) from
+        (select distinct dh.id, dh.total_price
+        from jsh_depot_head dh
+        left join jsh_depot_item di on dh.id = di.header_id
+        where 1=1
         and di.id is not null
         <if test="type != null">
             and dh.type=#{type}
@@ -919,7 +923,7 @@
             )
         </if>
         and ifnull(dh.delete_flag,'0') !='1'
-        and ifnull(di.delete_flag,'0') !='1'
+        and ifnull(di.delete_flag,'0') !='1') tb
     </select>
 
     <select id="debtList" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 3c44d757..a56ceea7 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -455,7 +455,9 @@
     </select>
 
     <select id="inOrOutPrice" resultType="java.math.BigDecimal">
-        select ifnull(sum(discount_last_money),0) as allMoney from jsh_depot_head dh
+        select ifnull(sum(discount_last_money),0) as allMoney from
+        (select distinct dh.id, dh.discount_last_money
+        from jsh_depot_head dh
         left join jsh_depot_item di on dh.id = di.header_id
         where 1=1
         and di.id is not null
@@ -470,11 +472,13 @@
             )
         </if>
         and ifnull(dh.delete_flag,'0') !='1'
-        and ifnull(di.delete_flag, '0') != '1'
+        and ifnull(di.delete_flag, '0') != '1') tb
     </select>
 
     <select id="inOrOutRetailPrice" resultType="java.math.BigDecimal">
-        select ifnull(sum(total_price),0) as allMoney from jsh_depot_head dh
+        select ifnull(sum(total_price),0) as allMoney from
+        (select distinct dh.id, dh.total_price
+        from jsh_depot_head dh
         left join jsh_depot_item di on dh.id = di.header_id
         where 1=1
         and di.id is not null
@@ -489,7 +493,7 @@
             )
         </if>
         and ifnull(dh.delete_flag,'0') !='1'
-        and ifnull(di.delete_flag, '0') != '1'
+        and ifnull(di.delete_flag, '0') != '1') tb
     </select>
 
     <select id="getStockCheckSumByDepotList"  resultType="java.math.BigDecimal">