From 1667372f02fb00dc76e172b5348c8e75ffb79bb9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 10 五月 2021 16:58:45 +0800
Subject: [PATCH] 1.盘点出库状态工作任务不进行删除 2.托盘码为空不允许进行盘点出库

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

diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index 83fc826..313dbc2 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"/>
@@ -43,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, 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.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">
@@ -68,6 +55,15 @@
             #{item.lgnum, jdbcType=VARCHAR}, #{item.type, jdbcType=VARCHAR},
             #{item.altme, jdbcType=VARCHAR},
             #{item.appeUser,jdbcType=DECIMAL},#{item.appeTime,jdbcType=TIMESTAMP})
+        </foreach>
+        END;
+    </insert>
+
+    <insert 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;
     </insert>
@@ -116,4 +112,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