From 48a031b40b23d7225899e3de0c6fb6df9bc2ee26 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 13 九月 2024 17:48:32 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/MatMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index f878349..28a995c 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -55,11 +55,13 @@
         LEFT JOIN (
             select
             matnr,
-            sum(anfme) as amount
+            sum(anfme) as amount,
+            batch
             from man_loc_detl
-            group by matnr
+            group by matnr,batch
         ) as mld on mld.matnr = mm.matnr
         WHERE 1=1
+        and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
         AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
         <if test="matnr != null and matnr != ''">
             and mm.matnr like concat('%',#{matnr},'%')
@@ -67,6 +69,9 @@
         <if test="maktx != null and maktx != ''">
             and mm.maktx like concat('%',#{maktx},'%')
         </if>
+        <if test="batch != null and batch != ''">
+            and mld.batch like concat('%',#{batch},'%')
+        </if>
         ORDER BY mm.create_time DESC
     </select>
 

--
Gitblit v1.9.1