From 5805a82d476338a95b33feed4623888e8c9c97d1 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 13:52:33 +0800
Subject: [PATCH] 取消的时候也保存订单

---
 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml |   18 ++++++++++++++++--
 1 files changed, 16 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..ffd50a8 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">
@@ -112,8 +115,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