From a8995bfca6bc1ee4dbd988c5e5b5d89c19232ad6 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 28 四月 2021 09:49:33 +0800
Subject: [PATCH] erp平仓入库物料状态更新

---
 src/main/resources/mapper/LocNormalMapper.xml |   47 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index e37045b..83fc826 100644
--- a/src/main/resources/mapper/LocNormalMapper.xml
+++ b/src/main/resources/mapper/LocNormalMapper.xml
@@ -30,17 +30,17 @@
     <update id="updateLocNormal">
         update asr_loc_normal set anfme = #{anfme,jdbcType=DECIMAL},
         modi_user = #{modiUser, jdbcType=DECIMAL}, modi_time = #{modiTime, jdbcType=TIMESTAMP}
-        where matnr = #{matnr,jdbcType=VARCHAR}
+        where matnr = #{matnr,jdbcType=VARCHAR} and id = #{id, jdbcType=DECIMAL}
     </update>
 
     <update id="outLocNormal">
         update asr_loc_normal set state = '2',modi_user = #{modiUser, jdbcType=DECIMAL},
-        modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR}
+        modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR} and id = #{id, jdbcType=DECIMAL}
     </update>
 
     <update id="removeLocNormal">
         update asr_loc_normal set state = '3',modi_user = #{modiUser, jdbcType=DECIMAL},
-        modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR}
+        modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR} and id = #{id, jdbcType=DECIMAL}
     </update>
 
     <insert id="locNormalIn">
@@ -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>
 
@@ -83,4 +96,24 @@
         update asr_loc_normal set anfme = #{anfme, jdbcType=DECIMAL},modi_user = #{modiUser, jdbcType=DECIMAL},modi_time = #{modiTime, jdbcType=TIMESTAMP}
         where matnr = #{matnr,jdbcType=VARCHAR} and warehouse = #{warehouse,jdbcType=VARCHAR} and id = #{id,jdbcType=DECIMAL}
     </update>
+
+    <select id="pdaLocNormalWarehouseQuery" resultMap="BaseResultMap">
+        select id,matnr, maktx, warehouse from asr_loc_normal
+        where warehouse = #{warehouse, jdbcType=VARCHAR}
+        and state = '1'
+        <if test="matnr != ''">
+            and matnr = #{matnr, jdbcType=VARCHAR}
+        </if>
+        COLLATE Chinese_PRC_CS_AS
+    </select>
+
+    <update id="pdaLocNormalMove">
+        BEGIN
+        <foreach collection="list" item="item" index="index">
+            update asr_loc_normal set warehouse = #{item.warehouse,jdbcType=VARCHAR},
+            modi_user = #{item.modiUser, jdbcType=DECIMAL},modi_time = #{item.modiTime, jdbcType=TIMESTAMP}
+            where id = #{item.id,jdbcType=DECIMAL}
+        </foreach>
+        END;
+    </update>
 </mapper>

--
Gitblit v1.9.1