From b5d0bbde2cd8d77e781690a7b3e762a5ce7645ca Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 02 六月 2021 14:43:23 +0800
Subject: [PATCH] pda新增小车组托入库功能
---
src/main/resources/mapper/LocNormalMapper.xml | 122 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index af772d4..47e5c94 100644
--- a/src/main/resources/mapper/LocNormalMapper.xml
+++ b/src/main/resources/mapper/LocNormalMapper.xml
@@ -4,22 +4,23 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocNormal">
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
- <result column="lgnum" property="lgnum" />
- <result column="type" property="type" />
- <result column="mnemonic" property="mnemonic" />
- <result column="supplier" property="supplier" />
- <result column="warehouse" property="warehouse" />
- <result column="brand" property="brand" />
- <result column="anfme" property="anfme" />
- <result column="bname" property="bname" />
- <result column="memo" property="memo" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="state" property="state" />
+ <result column="matnr" property="matnr"/>
+ <result column="maktx" property="maktx"/>
+ <result column="lgnum" property="lgnum"/>
+ <result column="type" property="type"/>
+ <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"/>
+ <result column="memo" property="memo"/>
+ <result column="modi_user" property="modiUser"/>
+ <result column="modi_time" property="modiTime"/>
+ <result column="appe_user" property="appeUser"/>
+ <result column="appe_time" property="appeTime"/>
+ <result column="state" property="state"/>
</resultMap>
<select id="getLocNormalData" resultMap="BaseResultMap">
@@ -30,16 +31,99 @@
<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="pdaLocNormalIn">
+ BEGIN
+ <foreach collection="list" item="item" index="index">
+ 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.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>
+
+ <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
+ <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>
+
+ <update id="pdaLocNormalOut1">
+ update asr_loc_normal set state = '2',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>
+
+ <update id="pdaLocNormalOut2">
+ 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>
+
+ <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