From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
index 40d4822..c4153c5 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -106,13 +106,13 @@
<include refid="queryWhereSql"/>
</select>
- <insert id="insertOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
- insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,container_id,user_id)
- values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{containerId},#{userId})
+ <insert id="insertOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve" useGeneratedKeys = "true" keyProperty = "id">
+ insert into ope_warehouse_reserve(reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,container_id,user_id)
+ values (#{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{containerId},#{userId})
</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,container_id,user_id)
- values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{applyCode},#{orderCode},#{containerId},#{userId})
+ <insert id="insertOpeWarehouseReserve2" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve" useGeneratedKeys = "true" keyProperty = "id">
+ insert into ope_warehouse_reserve(reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,apply_code,order_code,container_id,user_id)
+ values ( #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{applyCode},#{orderCode},#{containerId},#{userId})
</insert>
<update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
@@ -208,6 +208,21 @@
order by oa.update_time,oa.reserve
</select>
+ <select id="countByReagentId" resultType="java.lang.Integer">
+ select ifnull(sum(owr.reserve),0)
+ from ope_warehouse_reserve as owr
+ where owr.reserve > 0
+ and owr.reagent_id = #{id}
+ and owr.valid_flag = 1
+ group by owr.reagent_id
+ </select>
+ <select id="getRowData" resultMap="OpeWarehouseReserve">
+
+ <include refid="queryColumns"/>
+ from ope_warehouse_reserve as oa
+ <include refid="queryJoins"/>
+ where oa.id = #{id}
+ </select>
<update id="updateByReId" parameterType="java.util.Map">
update ope_warehouse_reserve set reagent_id=#{newReId} where reagent_id=#{oldReId}
--
Gitblit v1.9.2