From 31ffbaf322685984516cfb284fa58741debf4e96 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
index ea9d73b..060936f 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -115,8 +115,21 @@
</insert>
<update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
- update ope_warehouse_reserve set reagent_id=#{reagentId},warehouseId=#{warehouseId}, article_number=#{articleNumber}, reserve=#{reserve}, update_time=now(),
- container_id=#{containerId}
+ update ope_warehouse_reserve
+ <set>
+ 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