From 61de83f769642ff7da3d7f32b39c5014167a2950 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 15 Jan 2021 17:34:48 +0800
Subject: [PATCH] 修改试剂库、库存查询,登录超时,导出订单领取
---
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
index 6c81389..0f32736 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -29,7 +29,8 @@
<result property="updateTime" column="update_time"></result>
<result property="supplierName" column="supplierName"></result>
<result property="productHome" column="product_home"></result>
- <result property="productHomeName" column="productHomeName"></result>
+ <result property="productHomeName" column="productHomeName"></result>
+ <result property="productSn" column="product_sn"/>
</association>
</resultMap>
@@ -49,9 +50,12 @@
<if test="reagentName != null and reagentName != ''">
and sr.name like concat('%',#{reagentName},'%')
</if>
- <if test="warehouseId != null and warehouseId != ''">
- and oa.warehouseId=#{warehouseId}
- </if>
+ <if test="warehouseId != null and warehouseId != ''">
+ and oa.warehouseId=#{warehouseId}
+ </if>
+ <if test="productSn != null and productSn != ''">
+ and sr.product_sn like concat('%',#{productSn},'%')
+ </if>
</sql>
<sql id="queryColumns">
--
Gitblit v1.9.2