From 4a871a7f2348067e2db0ad55fc6565a649cc93aa Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 8 Mar 2025 23:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E3=80=81=E8=BF=9B=E9=94=80=E5=AD=98=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E9=AB=98=E7=89=88=E6=9C=ACsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper_xml/DepotHeadMapperEx.xml    | 3 ++-
 .../src/main/resources/mapper_xml/DepotItemMapperEx.xml    | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 8d900c096..08f78b71b 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -482,7 +482,8 @@
             and (dh.sub_type!='采购' and dh.sub_type!='采购退货' and dh.sub_type!='销售' and dh.sub_type!='销售退货')
         </if>
         and ifnull(dh.delete_flag,'0') !='1'
-        group by di.material_id
+        group by di.material_id, me.bar_code, m.name,m.model,m.standard,m.color,m.brand,m.mfrs,
+        mc.name, m.unit, u.basic_unit
         <if test="column == 'createTime'">
             order by materialId desc
         </if>
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index e9fc5504d..19bfab726 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -376,7 +376,9 @@
             and dh.oper_time &lt;= #{endTime}
         </if>
         and ifnull(m.delete_flag,'0') !='1'
-        group by m.id
+        group by m.id, me.bar_code, m.name, m.mfrs, m.model, m.standard, m.brand,
+        m.other_field1,m.other_field2,m.other_field3,m.unit, u.basic_unit, m.color, m.unit_id, u.name,
+        me.purchase_decimal, mcs.current_unit_price
         order by m.id desc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
@@ -473,7 +475,8 @@
             and (dh.status = '1' or dh.status = '2' or dh.status = '3')
         </if>
         and ifnull(m.delete_flag,'0') !='1'
-        group by m.id
+        group by m.id, me.bar_code, m.name, m.mfrs, m.model, m.standard,
+        m.other_field1,m.other_field2,m.other_field3, m.unit, u.basic_unit, m.color, m.brand, u.name
         order by m.id desc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}