From 64126dfd00ed90af484fbf7b173e00fcebc4f9fa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 24 五月 2023 15:56:11 +0800
Subject: [PATCH] 入库通知档和历史档增加mat_type物料类型，组托增加mat_type
---
src/main/resources/mapper/MatMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index f878349..f710d44 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -8,6 +8,7 @@
<result column="uuid" property="uuid" />
<result column="tag_id" property="tagId" />
<result column="matnr" property="matnr" />
+ <result column="matnr_new" property="matnrNew" />
<result column="maktx" property="maktx" />
<result column="name" property="name" />
<result column="specs" property="specs" />
@@ -42,8 +43,12 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
-
<result column="stock" property="stock" />
+ <result column="store_max" property="storeMax" />
+ <result column="store_min" property="storeMin" />
+ <result column="store_max_date" property="storeMaxDate" />
+ <result column="inout_everyday" property="inoutEveryday" />
+ <result column="mat_type" property="matType" />
</resultMap>
<select id="listByPage" resultMap="BaseResultMap">
@@ -60,6 +65,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 +73,27 @@
<if test="maktx != null and maktx != ''">
and mm.maktx like concat('%',#{maktx},'%')
</if>
- ORDER BY mm.create_time DESC
+ <if test="specs != null and specs != ''">
+ and mm.specs like concat('%',#{specs},'%')
+ </if>
+ ORDER BY mm.inout_everyday desc, 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="exportData" resultMap="BaseResultMap">
+ select * from man_mat
+ where 1=1
+ <if test="matnr != null and matnr != ''">
+ and matnr like '%' + #{matnr} + '%'
+ </if>
+ <if test="maktx != null and maktx != ''">
+ and maktx like '%' + #{maktx} + '%'
+ </if>
+ <if test="specs != null and specs != ''">
+ and specs like '%' + #{specs} + '%'
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.1