From e01fce2ebdd2bdba72682aa314656b57e68f211c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 01 九月 2025 16:05:06 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/MatMapper.xml | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 09a8d0a..5cc3281 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -53,23 +53,28 @@
FROM man_mat mm
LEFT JOIN man_tag mt ON mm.tag_id = mt.id
LEFT JOIN (
- select
- matnr,
- sum(anfme) as amount
- from man_loc_detl
- group by matnr
- ) as mld on mld.matnr = mm.matnr
+ SELECT
+ matnr,
+ SUM(anfme) AS amount
+ FROM man_loc_detl
+ GROUP BY matnr
+ ) 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})
+ <!-- 鉁� 灞忚斀 tag_id = 6 -->
+ AND mt.id != 6
+
+ <!-- 鉁� 鍒ゆ柇鏄惁鍦ㄨ矾寰勪腑 or 鏈韩 id 鍖归厤 -->
+ AND (CHARINDEX(',' + #{tagId} + ',', ',' + mt.path + ',') > 0 OR mt.id = #{tagId})
+
<if test="matnr != null and matnr != ''">
- and mm.matnr like concat('%',#{matnr},'%')
+ AND mm.matnr LIKE CONCAT('%', #{matnr}, '%')
</if>
- <if test="maktx != null and maktx != ''">
- and mm.maktx like concat('%',#{maktx},'%')
+ <if test="memo != null and memo != ''">
+ AND mm.memo LIKE CONCAT('%', #{memo}, '%')
</if>
ORDER BY mm.create_time DESC
</select>
+
<select id="listByPage2" resultMap="BaseResultMap">
SELECT
@@ -125,6 +130,17 @@
) t where t.matNo between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
+
+ <select id="getBoxMemoMap" resultType="map">
+ SELECT tag_id, memo
+ FROM man_mat
+ WHERE tag_id IN
+ <foreach item="id" collection="tagIds" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </select>
+
+
<select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
select
count(1)
--
Gitblit v1.9.1