From 68ad4cf704c0a7c575936455d07e3e2f53fefbc4 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 26 三月 2021 14:29:26 +0800
Subject: [PATCH] 1.0.5 1.小太阳需求改动

---
 src/main/resources/mapper/LocNormalMapper.xml |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index 3a2faf0..83fc826 100644
--- a/src/main/resources/mapper/LocNormalMapper.xml
+++ b/src/main/resources/mapper/LocNormalMapper.xml
@@ -60,17 +60,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>
 

--
Gitblit v1.9.1