From cd47dd7c3be0b1ca027c247007edc65f29cd3a3c Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 9 Mar 2025 14:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=85=BC=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/MaterialMapperEx.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index 0d93e361..1ca17a48 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -612,7 +612,8 @@
     </select>
 
     <select id="getListWithStock" resultMap="ResultMapListWithStock">
-        select m.*, me.commodity_unit unitName, mc.name categoryName, me.bar_code mBarCode,
+        select m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position,
+               me.commodity_unit unitName, mc.name categoryName, me.bar_code mBarCode,
         ifnull(me.purchase_decimal,0) purchaseDecimal,
         ifnull(mcs.current_unit_price,0) currentUnitPrice,
         ifnull(sum(mcs.current_number),0) currentStock,
@@ -649,9 +650,10 @@
             or m.other_field2 like #{bindKey} or m.other_field3 like #{bindKey})
         </if>
         and ifnull(m.delete_flag,'0') !='1'
-        group by m.id
+        group by m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position,
+        me.commodity_unit, mc.name, me.bar_code, me.purchase_decimal, mcs.current_unit_price
         <if test="zeroStock == 0">
-            having currentStock!=0
+            having ifnull(sum(mcs.current_number),0)!=0
         </if>
         <if test="column == 'createTime'">
             order by m.id desc
@@ -698,7 +700,7 @@
         and ifnull(m.delete_flag,'0') !='1'
         group by m.id
         <if test="zeroStock == 0">
-            having currentStock!=0
+            having ifnull(sum(mcs.current_number),0)!=0
         </if>
         ) tb
     </select>