From 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Wed, 03 Feb 2021 15:48:28 +0800
Subject: [PATCH] 取消领用
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index 6e1b950..dfc4fef 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -198,6 +198,7 @@
</if>
WHERE ouf.operatestate = #{operatestate}
and LENGTH(trim(ouf.receipt_number))>0
+ and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
</if>
@@ -250,6 +251,7 @@
</if>
WHERE ouf.operatestate = #{operatestate}
and LENGTH(trim(ouf.receipt_number))>0
+ and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
</if>
@@ -281,14 +283,14 @@
</if>
</select>
<select id="getApplyInfo" resultType="com.nanometer.smartlab.entity.dto.PersonUseDetail">
- SELECT
+ SELECT
ors.reagent_id reagentId,
ors.article_number articleNumber,
ouf.reagent_code reagentCode,
sr.product_sn productSn,
sr.NAME reagentName,
- bm1.meta_value reagentFormat,
- CONCAT(sr.per_box,bm1.meta_value) perInfo,
+ bm.meta_value reagentFormat,
+ CONCAT(sr.main_metering,bm1.meta_value) perInfo,
bm2.meta_value productHome,
bm3.meta_value controlProducts
from `ope_use_flow` ouf
@@ -300,6 +302,7 @@
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
WHERE ouf.operatestate = #{operatestate}
and ouf.receipt_number = #{receiptNumber}
+ and ouf.valid_flag = 1
</select>
@@ -315,6 +318,7 @@
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
WHERE ouf.operatestate = #{operatestate}
and ouf.receipt_number = #{receiptNumber}
+ and ouf.valid_flag = 1
</select>
<insert id="insertOpeUseFlow" parameterType="com.nanometer.smartlab.entity.OpeUseFlow">
--
Gitblit v1.9.2