From 7852471dd7eca58e49ab49cf6efdc8ad8cecd1c4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 25 一月 2021 17:32:04 +0800
Subject: [PATCH] 领用单信息补全
---
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
index 0f32736..1993ced 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -105,6 +105,10 @@
insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId)
values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId})
</insert>
+ <insert id="insertOpeWarehouseReserve2" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
+ insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,apply_code,order_code)
+ values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{applyCode},#{orderCode})
+ </insert>
<update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
update ope_warehouse_reserve set reagent_id=#{reagentId},warehouseId=#{warehouseId}, article_number=#{articleNumber}, reserve=#{reserve}, update_time=now()
@@ -114,6 +118,65 @@
<select id="selectByReId" resultMap="OpeWarehouseReserve">
select * from ope_warehouse_reserve where reagent_id=#{id}
</select>
+ <select id="selectWarehouseByReagentIdAndArticleNumber" resultMap="OpeWarehouseReserve" parameterType="java.util.Map">
+ SELECT
+ owr.id,
+ owr.reagent_id,
+ owr.warehouseId,
+ sw.NAME warehouseName,
+ sum( owr.reserve ) reserve
+ FROM
+ ope_warehouse_reserve owr
+ LEFT JOIN sys_warehouse sw ON sw.id = owr.warehouseId
+ WHERE
+ sw.valid_flag = 1
+ AND owr.valid_flag = 1
+ and owr.reserve > 0
+ and owr.reagent_id = #{reagentId}
+ <if test="articleNumber != null and articleNumber != ''">
+ and owr.article_number = #{articleNumber}
+ </if>
+ GROUP BY
+ reagent_id,
+ warehouseId
+ HAVING
+ reserve > 0
+ </select>
+
+ <select id="selectWarehouseByRidAndArtiNumberAndWid" resultMap="OpeWarehouseReserve" parameterType="java.util.Map">
+ SELECT
+ owr.id,
+ owr.reagent_id,
+ owr.warehouseId,
+ sw.NAME warehouseName,
+ owr.reserve,
+ owr.article_number
+ FROM
+ ope_warehouse_reserve owr
+ LEFT JOIN sys_warehouse sw ON sw.id = owr.warehouseId
+ WHERE
+ sw.valid_flag = 1
+ AND owr.valid_flag = 1
+ and owr.reserve > 0
+ and owr.reagent_id = #{reagentId}
+ <if test="articleNumber != null and articleNumber != ''">
+ and owr.article_number = #{articleNumber}
+ </if>
+ <if test="warehouseId != null and warehouseId != ''">
+ and owr.warehouseId = #{warehouseId}
+ </if>
+ </select>
+
+ <select id="getOpeWarehouseReserveList2" resultMap="OpeWarehouseReserve" parameterType="java.util.Map">
+
+ <include refid="queryColumns"/>
+ from ope_warehouse_reserve as oa
+ <include refid="queryJoins"/>
+ where oa.valid_flag = 1 and oa.reserve > 0
+ <include refid="queryWhereSql"/>
+
+ order by oa.update_time,oa.reserve
+ </select>
<update id="updateByReId" parameterType="java.util.Map">
update ope_warehouse_reserve set reagent_id=#{newReId} where reagent_id=#{oldReId}
@@ -123,6 +186,11 @@
<update id="updateCount" parameterType="java.util.Map">
update ope_warehouse_reserve set reserve=reserve+1 where reagent_id=#{reagentId} and article_number=#{articleNumber}
</update>
+ <update id="updateBtReserve">
+ UPDATE ope_warehouse_reserve
+ set reserve = reserve - #{1}
+ where id = #{0}
+ </update>
</mapper>
--
Gitblit v1.9.2