From ab41622d30946f83b34e5a5d881741237628f6f1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 14:26:39 +0800
Subject: [PATCH] 13

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

diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 3a5c151..ffd3de7 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -34,7 +34,7 @@
         <result column="dead_time" property="deadTime" />
         <result column="dead_warn" property="deadWarn" />
         <result column="source" property="source" />
-        <result column="check" property="check" />
+        <result column="inspect" property="inspect" />
         <result column="danger" property="danger" />
         <result column="status" property="status" />
         <result column="create_by" property="createBy" />
@@ -48,18 +48,12 @@
 
     <select id="listByPage" resultMap="BaseResultMap">
         SELECT
-        isnull(mld.amount,0) as stock,
         mm.*
         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
+
         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},'%')
@@ -70,7 +64,67 @@
         ORDER BY mm.create_time DESC
     </select>
 
+    <select id="listByPage2" resultMap="BaseResultMap">
+        SELECT
+        mm.*
+        FROM man_mat mm
+        LEFT JOIN man_tag mt ON mm.tag_id = mt.id
+
+        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},'%')
+        </if>
+        <if test="maktx != null and maktx != ''">
+            and mm.maktx like concat('%',#{maktx},'%')
+        </if>
+        <if test="specs != null and specs != ''">
+            and mm.specs like concat('%',#{specs},'%')
+        </if>
+        ORDER BY mm.create_time DESC
+    </select>
+
     <select id="selectByMatnr" resultMap="BaseResultMap">
         select top 1 * from man_mat where 1=1 and matnr = #{matnr}
     </select>
+
+    <select id="selectByMatnrLink" resultMap="BaseResultMap">
+        select * from man_mat
+        where 1=1
+        <if test="matnr != null and matnr != ''">
+            and mm.matnr like concat('%',#{matnr},'%')
+        </if>
+    </select>
+
+    <select id="selectNewUpdateTime" resultMap="BaseResultMap">
+        select top 1 * from man_mat
+        where 1=1
+        ORDER BY create_time ASC
+--         ORDER BY update_time DESC
+    </select>
+
+    <select id="getMatTurnPage" resultMap="BaseResultMap">
+        select * from
+        (
+        select top 16
+        ROW_NUMBER() over (order by a.matnr) as matNo,
+        a.*
+        from man_mat a
+        where 1=1
+        <if test="matnr!=null and matnr!='' ">
+            and a.matnr like concat('%',#{matnr},'%')
+        </if>
+        ) t where t.matNo between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+    </select>
+
+    <select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select
+        count(1)
+        from man_mat a
+        where 1=1
+        <if test="matnr!=null and matnr!='' ">
+            and a.matnr = #{matnr}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.1