From faecccbe46a1f85b5d9b18fce12e02764faba78e Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 12:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/LocNormalMapper.xml |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index 32c52f4..47e5c94 100644
--- a/src/main/resources/mapper/LocNormalMapper.xml
+++ b/src/main/resources/mapper/LocNormalMapper.xml
@@ -44,20 +44,6 @@
         modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR} and id = #{id, jdbcType=DECIMAL}
     </update>
 
-    <insert id="locNormalIn">
-        BEGIN
-        <foreach collection="list" item="item" index="index">
-            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.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>
-        END;
-    </insert>
-
     <insert id="pdaLocNormalIn">
         BEGIN
         <foreach collection="list" item="item" index="index">
@@ -73,6 +59,24 @@
         END;
     </insert>
 
+    <update id="pdaLocNormalUpdate">
+        BEGIN
+        <foreach collection="list" item="item" index="index">
+            update asr_loc_normal set anfme = #{item.anfme,jdbcType=DECIMAL}
+            where supplier = #{item.supplier,jdbcType=VARCHAR} and state = '1' and warehouse = #{item.warehouse,jdbcType=VARCHAR}
+        </foreach>
+        END;
+    </update>
+
+    <update id="withoutSupplierLocNormalUpdate">
+        BEGIN
+        <foreach collection="list" item="item" index="index">
+            update asr_loc_normal set anfme = #{item.anfme,jdbcType=DECIMAL}
+            where matnr = #{item.matnr,jdbcType=VARCHAR} and state = '1' and warehouse = #{item.warehouse,jdbcType=VARCHAR} and mnemonic = #{item.mnemonic, jdbcType=VARCHAR}
+        </foreach>
+        END;
+    </update>
+
     <select id="pdaLocNormalQuery" resultMap="BaseResultMap">
         select id, matnr,maktx, warehouse,anfme from asr_loc_normal
         where 1 = 1

--
Gitblit v1.9.1