From c81332c3a4effcc55f68ecff8abb7f3fc5158de8 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 05 五月 2021 14:35:41 +0800
Subject: [PATCH] 1.平仓入库erp单号对应功能实现
---
src/main/resources/mapper/LocNormalMapper.xml | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index 3a2faf0..32c52f4 100644
--- a/src/main/resources/mapper/LocNormalMapper.xml
+++ b/src/main/resources/mapper/LocNormalMapper.xml
@@ -11,6 +11,7 @@
<result column="mnemonic" property="mnemonic"/>
<result column="supplier" property="supplier"/>
<result column="warehouse" property="warehouse"/>
+ <result column="warehouseName" property="warehouseName"/>
<result column="brand" property="brand"/>
<result column="anfme" property="anfme"/>
<result column="bname" property="bname"/>
@@ -46,11 +47,11 @@
<insert id="locNormalIn">
BEGIN
<foreach collection="list" item="item" index="index">
- INSERT INTO asr_loc_normal (matnr, maktx, anfme, altme, lgnum, type, supplier, brand, warehouse, state,
+ INSERT INTO asr_loc_normal (matnr, maktx, anfme, altme, lgnum, type, mnemonic, supplier, brand, warehouse, state,
appe_user, appe_time)
VALUES (#{item.matnr,jdbcType=VARCHAR}, #{item.maktx,jdbcType=VARCHAR}, #{item.anfme,jdbcType=DECIMAL},
#{item.altme,jdbcType=VARCHAR},#{item.lgnum, jdbcType=VARCHAR}, #{item.type, jdbcType=VARCHAR},
- #{item.supplier, jdbcType=VARCHAR},#{item.brand, jdbcType=VARCHAR},
+ #{item.mnemonic, jdbcType=VARCHAR} ,#{item.supplier, jdbcType=VARCHAR},#{item.brand, jdbcType=VARCHAR},
#{item.warehouse,jdbcType=VARCHAR}, '1', #{item.appeUser,jdbcType=DECIMAL},
#{item.appeTime,jdbcType=TIMESTAMP})
</foreach>
@@ -60,17 +61,30 @@
<insert id="pdaLocNormalIn">
BEGIN
<foreach collection="list" item="item" index="index">
- INSERT INTO asr_loc_normal (matnr, maktx, anfme, warehouse, state, appe_user, appe_time)
+ INSERT INTO asr_loc_normal (matnr, maktx, anfme, mnemonic, supplier, warehouse, state, lgnum, type, altme,
+ appe_user, appe_time)
VALUES (#{item.matnr,jdbcType=VARCHAR}, #{item.maktx,jdbcType=VARCHAR}, #{item.anfme,jdbcType=DECIMAL},
- #{item.warehouse,jdbcType=VARCHAR}, '1', #{item.appeUser,jdbcType=DECIMAL},
- #{item.appeTime,jdbcType=TIMESTAMP})
+ #{item.mnemonic, jdbcType=VARCHAR}, #{item.supplier, jdbcType=VARCHAR},
+ #{item.warehouse,jdbcType=VARCHAR}, '1',
+ #{item.lgnum, jdbcType=VARCHAR}, #{item.type, jdbcType=VARCHAR},
+ #{item.altme, jdbcType=VARCHAR},
+ #{item.appeUser,jdbcType=DECIMAL},#{item.appeTime,jdbcType=TIMESTAMP})
</foreach>
END;
</insert>
<select id="pdaLocNormalQuery" resultMap="BaseResultMap">
select id, matnr,maktx, warehouse,anfme from asr_loc_normal
- where warehouse = #{warehouse,jdbcType=VARCHAR} and matnr =#{matnr,jdbcType=VARCHAR}
+ where 1 = 1
+ <if test="warehouse != null and warehouse != ''">
+ and warehouse = #{warehouse,jdbcType=VARCHAR}
+ </if>
+ <if test="matnr != null and matnr != ''">
+ and matnr =#{matnr,jdbcType=VARCHAR}
+ </if>
+ <if test="billNo != null and billNo != ''">
+ and supplier = #{billNo, jdbcType=VARCHAR}
+ </if>
and state = '1' COLLATE Chinese_PRC_CS_AS
</select>
@@ -103,4 +117,9 @@
</foreach>
END;
</update>
+
+ <select id="queryLocNorlMatnr" resultMap="BaseResultMap">
+ select a.*,b.name as warehouseName from asr_loc_normal a left join asr_loc_area b on a.warehouse = b.uuid
+ where matnr = #{matnr} and state = '1'
+ </select>
</mapper>
--
Gitblit v1.9.1