From 5d6da5dd842088e148c9fd11db329fe75e4b4d12 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期日, 27 八月 2023 13:44:28 +0800
Subject: [PATCH] 优化Modbus-TCP命令发送
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 84 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 83 insertions(+), 1 deletions(-)
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index efad670..73bd4ac 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -123,6 +123,7 @@
from
D_INOUT_RECORD
<where>
+ <if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
<if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</if>
<if test="param.type != null and param.type != '' ">AND TYPE_ = #{param.type}</if>
<if test="param.plateNum != null and param.plateNum != '' ">AND PLATE_NUM_ = #{param.plateNum}</if>
@@ -156,7 +157,7 @@
</if>
</where>
AND RECORD_STATUS_ != 'DEL'
- ORDER BY COMPLETE_TIME_ DESC
+ ORDER BY UPDATE_TIME_ DESC
LIMIT 1
</select>
@@ -220,6 +221,7 @@
<if test="data.checkStatus != null">CHECK_STATUS_ = #{data.checkStatus},</if>
<if test="data.checkId != null">CHECK_ID_ = #{data.checkId},</if>
<if test="data.checkUser != null">CHECK_USER_ = #{data.checkUser},</if>
+ <if test="data.checkTime != null">CHECK_TIME_ = #{data.checkTime},</if>
<if test="data.registerTime != null">REGISTER_TIME_ = #{data.registerTime},</if>
<if test="data.registerUser != null">REGISTER_USER_ = #{data.registerUser},</if>
<if test="data.userName != null">USER_NAME_ = #{data.userName},</if>
@@ -235,10 +237,12 @@
<if test="data.customerName != null">CUSTOMER_NAME_ = #{data.customerName},</if>
<if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>
<if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>
+ <if test="data.foodLocationId != null">FOOD_LOCATION_ID_ = #{data.foodLocationId},</if>
<if test="data.foodLocation != null">FOOD_LOCATION_ = #{data.foodLocation},</if>
<if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
<if test="data.deHandle != null">DE_HANDLE_ = #{data.deHandle},</if>
<if test="data.deOther != null">DE_OTHER_ = #{data.deOther},</if>
+ <if test="data.deOtherInfo != null">DE_OTHER_INTO_ = #{data.deOtherInfo},</if>
<if test="data.fullWeight != null">FULL_WEIGHT_ = #{data.fullWeight},</if>
<if test="data.fullWeightTime != null">FULL_WEIGHT_TIME_ = #{data.fullWeightTime},</if>
<if test="data.fullWeightUser != null">FULL_WEIGHT_USER_ = #{data.fullWeightUser},</if>
@@ -246,6 +250,7 @@
<if test="data.emptyWeightTime != null">EMPTY_WEIGHT_TIME_ = #{data.emptyWeightTime},</if>
<if test="data.emptyWeightUser != null">EMPTY_WEIGHT_USER_ = #{data.emptyWeightUser},</if>
<if test="data.netWeight != null">NET_WEIGHT_ = #{data.netWeight},</if>
+ <if test="data.settleId != null">SETTLE_ID_ = #{data.settleId},</if>
<if test="data.settleWeight != null">SETTLE_WEIGHT_ = #{data.settleWeight},</if>
<if test="data.recordWeight != null">RECORD_WEIGHT_ = #{data.recordWeight},</if>
<if test="data.handleUser != null">HANDLE_USER_ = #{data.handleUser},</if>
@@ -254,6 +259,8 @@
<if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
<if test="data.foodType != null">FOOD_TYPE_ = #{data.foodType},</if>
<if test="data.price != null">PRICE_ = #{data.price},</if>
+ <if test="data.bzw != null">bzw = #{data.bzw},</if>
+ <if test="data.dbz != null">dbz = #{data.dbz},</if>
<if test="data.settleMoney != null">SETTLE_MONEY_ = #{data.settleMoney},</if>
PROGRESS_ = #{data.progress}
where
@@ -551,4 +558,79 @@
</if>
</select>
+ <!-- 鏍规嵁鏉′欢鏌ヨ锛岃姹傛椂闂存潯浠跺繀椤伙紝蹇呴』鏄甯告暟鎹� -->
+ <select id="listLossOver" resultType="com.ld.igds.models.InoutLossOver"
+ parameterType="com.ld.igds.inout.dto.InoutParam">
+ select
+ ID_ as id,
+ COMPANY_ID_ as companyId,
+ DEPT_ID_ as deptId,
+ DEPOT_ID_ as depotId,
+ TYPE_ as type,
+ SUBMIT_TIME_ as submitTime,
+ rkjz as rkjz,
+ rksj as rksj,
+ rksf as rksf,
+ rkzz as rkzz,
+ cksj as cksj,
+ ckjz as ckjz,
+ cksf as cksf,
+ ckzz as ckzz,
+ AMOUNT_ as amount,
+ sysfzc as sysfzc,
+ syyy as syyy,
+ ccshr as ccshr,
+ AUDIT_CCSH_ as auditCcsh,
+ INFO_CCSH_ as InfoCcsh,
+ zjshr as zjshr,
+ AUDIT_ZJSH_ as auditZjsh,
+ INFO_ZJSH_ as infoZjsh,
+ AUDIT_TJSH_ as auditTjsh,
+ INFO_TJSH_ as infoTjsh,
+ kjshr as kjshr,
+ AUDIT_KJSH_ as auditKjsh,
+ INFO_KJSH_ as infoKjsh,
+ ldshr as ldshr,
+ AUDIT_LDSH_ as auditLdsh,
+ INFO_LDSH_ as infoLdsh,
+ REMARK_ as remark,
+ UPDATE_TIME_ as updateTime,
+ UPDATE_USER_ as updateUser
+ from
+ D_INOUT_LOSS_OVER
+ <where>
+ <if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</if>
+ <if test="param.deptId != null and param.deptId != ''">AND DEPT_ID_ = #{param.deptId}</if>
+ <if test="param.depotId != null and param.depotId != '' ">AND DEPOT_ID_ = #{param.depotId}</if>
+ <if test="param.type != null and param.type != '' ">AND TYPE_ = #{param.type}</if>
+ <if test="param.end != null">AND
+ UPDATE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
+ </if>
+ <if test="param.start != null">AND
+ UPDATE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
+ </if>
+ ORDER BY UPDATE_TIME_
+ </where>
+ </select>
+
+ <!-- 鑾峰彇寮�濮嬪懆鏈�-鎴嚦鍛ㄦ湡鍐咃紝鍑哄叆搴撳叆搴撻噸閲忔眹鎬诲悎璁� -->
+ <select id="sumLossOverWeight" resultType="com.ld.igds.data.CommonData"
+ parameterType="com.ld.igds.inout.dto.InoutParam">
+ select SUM(AMOUNT_) as numValue1
+ from D_INOUT_LOSS_OVER
+ <where>
+ <if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</if>
+ <if test="param.deptId != null and param.deptId != ''">AND DEPT_ID_ = #{param.deptId}</if>
+ <if test="param.depotId != null and param.depotId != '' ">AND DEPOT_ID_ = #{param.depotId}</if>
+ <if test="param.type != null and param.type != '' ">AND TYPE_ = #{param.type}</if>
+ <if test="param.end != null">AND
+ UPDATE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
+ </if>
+ <if test="param.start != null">AND
+ UPDATE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
+ </if>
+ ORDER BY UPDATE_TIME_
+ </where>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3