From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 22 二月 2021 10:34:59 +0800
Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 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 89ad484..be2c5f2 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>
@@ -215,6 +216,12 @@
</if>
<if test="receiptNumber !=null and receiptNumber != ''">
and ouf.receipt_number like concat("%",#{receiptNumber},"%")
+ </if>
+ <if test="reagentName !=null and reagentName != ''">
+ and sr.name like concat("%",#{reagentName},"%")
+ </if>
+ <if test="applyPerson !=null and applyPerson != ''">
+ and su.name like concat("%",#{applyPerson},"%")
</if>
group by ouf.receipt_number) a
@@ -244,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>
@@ -262,6 +270,12 @@
<if test="receiptNumber !=null and receiptNumber != ''">
and ouf.receipt_number like concat("%",#{receiptNumber},"%")
</if>
+ <if test="reagentName !=null and reagentName != ''">
+ and sr.name like concat("%",#{reagentName},"%")
+ </if>
+ <if test="applyPerson !=null and applyPerson != ''">
+ and su.name like concat("%",#{applyPerson},"%")
+ </if>
group by ouf.receipt_number
ORDER BY ouf.create_time desc
<if test="first != null and pageSize != null">
@@ -269,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
@@ -288,6 +302,34 @@
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>
+
+
+ <select id="getApplyInfoSize" resultType="java.lang.Integer">
+ SELECT
+ count(0)
+ from `ope_use_flow` ouf
+ LEFT JOIN ope_reagent_status ors ON ors.reagent_code = ouf.reagent_code
+ LEFT join sys_reagent sr ON ors.reagent_id = sr.id
+ LEFT JOIN base_meta bm ON bm.id = sr.reagent_format
+ LEFT JOIN base_meta bm1 on bm1.id = sr.reagent_unit
+ LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
+ 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>
+ <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">
--
Gitblit v1.9.2