From 561d3ea40290a16f6c31b87aaeaaf8b5d2a7d334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 1 Mar 2023 22:28:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=9F=B1=E7=8A=B6=E5=9B=BE=E8=AE=A1=E7=AE=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper_xml/DepotItemMapperEx.xml     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index a87b3de1..3c44d757 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -456,7 +456,9 @@
 
     <select id="inOrOutPrice" resultType="java.math.BigDecimal">
         select ifnull(sum(discount_last_money),0) as allMoney 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
         and dh.type=#{type} and dh.sub_type=#{subType}
         and dh.oper_time &gt;= #{beginTime}
         and dh.oper_time &lt;= #{endTime}
@@ -468,11 +470,14 @@
             )
         </if>
         and ifnull(dh.delete_flag,'0') !='1'
+        and ifnull(di.delete_flag, '0') != '1'
     </select>
 
     <select id="inOrOutRetailPrice" resultType="java.math.BigDecimal">
         select ifnull(sum(total_price),0) as allMoney 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
         and dh.type=#{type} and dh.sub_type=#{subType}
         and dh.oper_time &gt;= #{beginTime}
         and dh.oper_time &lt;= #{endTime}
@@ -484,6 +489,7 @@
             )
         </if>
         and ifnull(dh.delete_flag,'0') !='1'
+        and ifnull(di.delete_flag, '0') != '1'
     </select>
 
     <select id="getStockCheckSumByDepotList"  resultType="java.math.BigDecimal">