From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 27 一月 2021 16:54:34 +0800
Subject: [PATCH] 合并

---
 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml |   15 +++++++++++++--
 1 files changed, 13 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 37123cb..198aed0 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -112,8 +112,19 @@
     </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(),
+        container_id=#{containerId},
+        <if test="articleNumber != null and articleNumber !=''">
+            article_number=#{articleNumber},
+        </if>
+        <if test="warehouseId != null and warehouseId !=''">
+            warehouseId=#{warehouseId},
+        </if>
+        </set>
         where id=#{id}
     </update>
 

--
Gitblit v1.9.2