From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 18 Aug 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml
index b6c5ed4..c0fc672 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml
@@ -49,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>
@@ -79,7 +79,7 @@
</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(),
controller_code=#{controllerCode}
--
Gitblit v1.9.2