From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml
index 158be80..c0fc672 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml
@@ -18,6 +18,7 @@
<result property="characterLeft" column="character_left"></result>
<result property="characterRight" column="character_right"></result>
<result property="controllerCode" column="controller_code"></result>
+ <result property="controllerName" column="controller_name"></result>
</resultMap>
<select id="getSysWarehouseContainerInfoList" parameterType="java.util.Map" resultMap="SysWarehouseContainer">
@@ -31,9 +32,14 @@
</select>
<select id="getSysWarehouseContainerList" parameterType="java.util.Map" resultMap="SysWarehouseContainer">
- select su.*,ss.name as warehouseName, ss.type as warehouseType from sys_warehouse_container as su
+ select su.*,ss.name as warehouseName, ss.type as warehouseType
+ ,
+ sc.controller_name
+ from sys_warehouse_container as su
left join sys_warehouse as ss on su.warehouse_id = ss.id
+ left join sys_controller sc on sc.controller_code = su.controller_code
where su.valid_flag = 1
+ and sc.valid_flag = 1
<if test="warehouseType != null and warehouseType != ''">
and ss.type = #{warehouseType}
</if>
@@ -43,7 +49,7 @@
<if test="warehouseId != null and warehouseId != ''">
and ss.id like #{warehouseId}
</if>
- order by ss.name ASC
+ order by ss.name ASC,su.create_time DESC
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
</if>
@@ -73,9 +79,10 @@
</insert>
<update id="updateSysWarehouseContainer" parameterType="com.nanometer.smartlab.entity.SysWarehouseContainer">
- update sys_warehouse_container set warehouse_id=#{warehouseId}, type=#{type}, container_code=#{containerCode},
+ update sys_warehouse_container set warehouse_id=#{warehouseId}, type=#{type}, container_code=#{containerCode},
info_code=#{infoCode}, structure=#{structure}, name=#{name}, character_left=#{characterLeft}, character_right=#{characterRight},
- update_time=now()
+ update_time=now(),
+ controller_code=#{controllerCode}
where id=#{id}
</update>
--
Gitblit v1.9.2