From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
index 198aed0..060936f 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -57,6 +57,9 @@
<if test="productSn != null and productSn != ''">
and sr.product_sn like concat('%',#{productSn},'%')
</if>
+ <if test="warehouseName != null and warehouseName != ''">
+ and sw.name like concat('%',#{warehouseName},'%')
+ </if>
</sql>
<sql id="queryColumns">
@@ -114,16 +117,18 @@
<update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
update ope_warehouse_reserve
<set>
- reagent_id=#{reagentId},
- reserve=#{reserve},
- update_time=now(),
- container_id=#{containerId},
- <if test="articleNumber != null and articleNumber !=''">
- article_number=#{articleNumber},
- </if>
- <if test="warehouseId != null and warehouseId !=''">
- warehouseId=#{warehouseId},
- </if>
+ reagent_id=#{reagentId},
+ reserve=#{reserve},
+ update_time=now(),
+ <if test="articleNumber != null and articleNumber !=''">
+ article_number=#{articleNumber},
+ </if>
+ <if test="warehouseId != null and warehouseId !=''">
+ warehouseId=#{warehouseId},
+ </if>
+ <if test="containerId != null and containerId !=''">
+ container_id=#{containerId},
+ </if>
</set>
where id=#{id}
</update>
--
Gitblit v1.9.2