From 6d8e5d522d1ad012a0bba760af6fb0837318d4fc Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Mon, 04 Jan 2021 10:17:04 +0800
Subject: [PATCH] 仓库入库、仓库领用不显示残存量，入库、领用、存放的状态如果智能柜给你传重量，你再显示重量，不给你传重量的参数，你就显示空 提出：秦老师
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index 9f73e83..7f6ea53 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -115,6 +115,7 @@
AND f.user_id= #{user}
WHERE f.id IS NOT NULL
and sr.valid_flag = 1
+ and sr.type != 3
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
</if>
@@ -143,6 +144,7 @@
AND f.user_id = #{user}
AND f.id IS NULL
where sr.valid_flag = 1
+ and sr.type != 3
<if test="cas != null and cas != ''">
and sr.cas like concat("%", #{cas} ,"%")
</if>
@@ -159,7 +161,7 @@
limit #{MaxSize}
</if>
) as reagent
- ORDER BY reagent.favortime DESC
+ ORDER BY reagent.favortime DESC,price asc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
</if>
@@ -375,7 +377,27 @@
and product_home is null
</if>
</select>
+ <select id="getReagent" resultMap="SysReagent">
+ select * From sys_reagent
+ where type=3
+ and valid_flag = 1
+ <if test="name!=null and name!=''">
+ and name =#{name}
+ </if>
+ <if test="cas!=null and cas!=''">
+ and cas =#{cas}
+ </if>
+ <if test="packing!=null and packing!=''">
+ and reagent_unit =#{packing}
+ </if>
+ <if test="factory!=null and factory!=''">
+ and product_home =#{factory}
+ </if>
+ <if test="specifications!=null and specifications!=''">
+ and reagent_format =#{specifications}
+ </if>
+ </select>
<insert id="insertSysReagent" parameterType="com.nanometer.smartlab.entity.SysReagent">
--
Gitblit v1.9.2