From db92e88a70a59437b48c9369cf1c46dba0ecb0a5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 15 十月 2023 13:25:33 +0800
Subject: [PATCH] #
---
 src/main/resources/mapper/MatMapper.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index f878349..f199f1b 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -42,7 +42,9 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="memo" property="memo" />
-
+        <result column="store_max" property="storeMax" />
+        <result column="store_min" property="storeMin" />
+        <result column="store_max_date" property="storeMaxDate" />
         <result column="stock" property="stock" />
     </resultMap>
 
@@ -60,6 +62,7 @@
             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},'%')
@@ -67,10 +70,18 @@
         <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="selectByBarcode" resultMap="BaseResultMap">
+        select top 1 * from man_mat where 1=1 and barcode = #{barcode}
+    </select>
+
 </mapper>
--
Gitblit v1.9.1