From 6d8e5d522d1ad012a0bba760af6fb0837318d4fc Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 04 一月 2021 10:17:04 +0800
Subject: [PATCH] 仓库入库、仓库领用不显示残存量，入库、领用、存放的状态如果智能柜给你传重量，你再显示重量，不给你传重量的参数，你就显示空 提出：秦老师
---
src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml b/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
index 84d2724..f5678c9 100644
--- a/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
@@ -298,7 +298,8 @@
</select>
<select id="selectByCodeAndName" resultType="com.nanometer.smartlab.entity.DangerousEncode">
select
- <include refid="Base_Column_List" />
+ container_number containerNumber, reagent_code reagentCode, reagent_name reagentName, cas, memo, property, feature, avoid,
+ status, fire, random, code, update_time, creator, count
from sys_dangerous_encode
<where>
1=1
@@ -309,11 +310,38 @@
and reagent_name = #{reagentname}
</if>
<if test="cas != null and cas != ''">
- and cas = #{cas}
+ and cas like concat("%",#{cas},"%")
</if>
<if test="code != null and code != ''">
and code = #{code}
</if>
</where>
</select>
+ <select id="selectByReagentName" resultType="com.nanometer.smartlab.entity.DangerousEncodeVo">
+ select
+ container_number containerNumber, reagent_code reagentCode, reagent_name reagentName, cas, memo, property, feature, avoid,
+ status, fire, random, code, update_time, creator, count
+ from sys_dangerous_encode
+ <where>
+ 1=1
+ <if test="reagentname != null and reagentname != ''">
+ and reagent_name like concat("%",#{reagentname},"%")
+ </if>
+ <if test="cas != null and cas != ''">
+ and cas like concat("%",#{cas},"%")
+ </if>
+ </where>
+ </select>
+ <select id="selectByName" resultType="com.nanometer.smartlab.entity.DangerousEncode">
+ select
+ id,container_number containerNumber, reagent_code reagentCode, reagent_name reagentName, cas, memo,
+ property, feature, avoid, status, fire, random, code, update_time, creator, count
+ from sys_dangerous_encode
+ <where>
+ 1=1
+ <if test="reagentname != null and reagentname != ''">
+ and reagent_name = #{reagentname}
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.2