From 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 26 Jan 2021 18:08:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
index c55af0e..36ae49e 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -111,12 +111,82 @@
</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()
+ update ope_warehouse_reserve
+ <set>
+ reagent_id=#{reagentId},
+ reserve=#{reserve},
+ update_time=now(),
+ <if test="articleNumber != null and articleNumber !=''">
+ article_number=#{articleNumber},
+ </if>
+ <if test="warehouseId != null and warehouseId !=''">
+ warehouseId=#{warehouseId},
+ </if>
+ </set>
where id=#{id}
</update>
<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">
@@ -127,6 +197,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