From 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 16:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index dfc4fef..5b5b10b 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -128,10 +128,10 @@
ss.name as supplierName,
l.name as laboratoryName,
w.name as warehouseName,
- lc.name as warehouseContainerName,
- wc.name as laboratoryContainerName,
- lc.container_code as warehouseContainerCode,
- wc.container_code as laboratoryContainerCode,
+ wc.name as warehouseContainerName,
+ lc.name as laboratoryContainerName,
+ wc.container_code as warehouseContainerCode,
+ lc.container_code as laboratoryContainerCode,
bm1.meta_value as operatestateName
from ope_use_flow as oa
left join ope_reagent_status ors on ors.reagent_code = oa.reagent_code
@@ -320,10 +320,28 @@
and ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
+ <select id="countOpeUseFlow" resultType="java.lang.Integer" parameterType="com.nanometer.smartlab.entity.OpeUseFlow">
+ select count(0)
+ from ope_use_flow
+ where reagent_code = #{reagentCode}
+ and status = #{status}
+ and house_id = #{houseId}
+ and container_id = #{containerId}
+ and create_time = #{createTime}
+ and operatestate =#{operateState}
+ and valid_flag = 1
+ </select>
<insert id="insertOpeUseFlow" parameterType="com.nanometer.smartlab.entity.OpeUseFlow">
- insert into ope_use_flow(id, reagent_code, status, house_id, container_id, user_id, remainder, place, store_type, valid_flag, create_time, realstatus, operatestate)
- values (#{id}, #{reagentCode}, #{status}, #{houseId}, #{containerId}, #{userId}, #{remainder}, #{place}, #{storeType}, 1, #{createTime}, #{realstatus},#{operateState})
+ insert into ope_use_flow(id, reagent_code, status, house_id, container_id, user_id, remainder, place, store_type, valid_flag, create_time, realstatus, operatestate
+ <if test="receipt_number != null">
+ ,receipt_number
+ </if>
+ )
+ values (#{id}, #{reagentCode}, #{status}, #{houseId}, #{containerId}, #{userId}, #{remainder}, #{place}, #{storeType}, 1, #{createTime}, #{realstatus},#{operateState}
+ <if test="receipt_number != null">
+ ,#{receiptNumber}
+ </if>)
</insert>
--
Gitblit v1.9.2