From a978a902b1ec850c70649fda61af6604bb8a8932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 13 Dec 2020 01:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BA=93=E5=AD=98=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=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 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 54577882..d8144640 100644
--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -154,14 +154,12 @@
 
     <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial">
         select m.id MId, m.name MName, m.mfrs MMfrs, m.model MModel, m.unit MaterialUnit, m.color MColor,
-        me.purchase_decimal, u.name unit_name
+        u.name unit_name, (select purchase_decimal from jsh_material_extend me where me.material_id=m.id and me.default_flag=1) purchase_decimal
         from jsh_material m
-        left join jsh_depot_item di on di.material_id=m.id  and ifnull(m.delete_Flag,'0') !='1'
+        left join jsh_depot_item di on di.material_id=m.id  and ifnull(di.delete_Flag,'0') !='1'
         left join jsh_depot_head dh on di.header_id=dh.id  and ifnull(dh.delete_flag,'0') !='1'
-        left join jsh_material_extend me on me.id=di.material_extend_id  and ifnull(me.delete_Flag,'0') !='1'
         left join jsh_unit u on m.unit_id=u.id and ifnull(u.delete_Flag,'0') !='1'
         where 1=1
-        and me.default_flag=1
         <if test="name != null">
             and m.name like '%${name}%'
         </if>
@@ -171,8 +169,8 @@
         <if test="endTime != null">
             and dh.oper_time &lt;= '${endTime}'
         </if>
-        and ifnull(di.delete_flag,'0') !='1'
-        group by m.id,m.name, m.model, m.unit, m.color, me.purchase_decimal, u.name
+        and ifnull(m.delete_flag,'0') !='1'
+        group by m.id,m.name, m.model, m.unit, m.color, u.name
         order by m.name, m.model asc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}