From 204bb9eb1ff8a9aca875381f6b8cfd689cbf4990 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 28 九月 2023 16:33:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/resources/mapper/CommonMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/igds-core/src/main/resources/mapper/CommonMapper.xml b/igds-core/src/main/resources/mapper/CommonMapper.xml
index 7948a31..a31668c 100644
--- a/igds-core/src/main/resources/mapper/CommonMapper.xml
+++ b/igds-core/src/main/resources/mapper/CommonMapper.xml
@@ -119,7 +119,8 @@
<!--鏇存柊搴撳瓨 -->
<update id="updateDepotStorage" parameterType="com.ld.igds.common.dto.DepotParam">
update D_DEPOT set
- STORAGE_REAL_ = #{param.weight}
+ STORAGE_REAL_ = #{param.weight},
+ DEPOT_STATUS_ = #{param.depotStatus}
where COMPANY_ID_ =
#{param.companyId}
and ID_ = #{param.depotId}
@@ -211,6 +212,8 @@
<if test="data.gasEnd != null ">GAS_END_ = #{data.gasEnd},</if>
<if test="data.pestStart != null ">PEST_START_ = #{data.pestStart},</if>
<if test="data.pestEnd != null ">PEST_END_ = #{data.pestEnd},</if>
+ <if test="data.pestSer != null ">PEST_SER_ = #{pestSer},</if>
+ <if test="data.verbSer != null ">VERB_SER_ = #{verbSer},</if>
</set>
where COMPANY_ID_ = #{data.companyId} AND DEPOT_ID_ = #{data.depotId}
</update>
--
Gitblit v1.9.3