From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 88 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 6 deletions(-)
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index f4beaba..ce2d3ab 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -104,14 +104,14 @@
<if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
<if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
<if test="param.end != null">AND
- COMPLETE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
+ UPDATE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
</if>
<if test="param.start != null">AND
- COMPLETE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
+ UPDATE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
</if>
AND PROGRESS_ = 'RECORD'
AND RECORD_STATUS_ != 'DEL'
- ORDER BY COMPLETE_TIME_
+ ORDER BY UPDATE_TIME_
</where>
</select>
@@ -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>
@@ -196,7 +197,7 @@
</set>
<where>
- COMPANY_ID_ = #{param.companyId},
+ COMPANY_ID_ = #{param.companyId}
AND ID_ = #{param.id}
</where>
</update>
@@ -535,10 +536,10 @@
<if test="param.foodVariety != null and param.foodVariety != ''">AND FOOD_VARIETY_ = #{param.foodVariety}</if>
<if test="param.id != null and param.id != ''">AND NOTICE_ID_ = #{param.id}</if>
<if test="param.start != null">AND
- COMPLETE_TIME_ <![CDATA[ > ]]> #{param.start}
+ UPDATE_TIME_ <![CDATA[ > ]]> #{param.start}
</if>
<if test="param.end != null">AND
- COMPLETE_TIME_ <![CDATA[ < ]]> #{param.end}
+ UPDATE_TIME_ <![CDATA[ < ]]> #{param.end}
</if>
</select>
@@ -557,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