From a195948e2f1db9d413194f7d33c93cca6a796ca8 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 05 七月 2023 02:42:11 +0800
Subject: [PATCH] 增加海康SDK，整理自动抬干业务逻辑
---
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index b43c21f..8eaa2f6 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -38,7 +38,6 @@
<if test="param.sampleStatus != null and param.sampleStatus != 'NONE' ">AND SAMPLE_TIME_ IS NOT NULL</if>
</where>
AND RECORD_STATUS_ != 'DEL'
- AND RECORD_STATUS_ != 'ERROR'
ORDER BY REGISTER_TIME_
</select>
@@ -99,7 +98,6 @@
<if test="param.checkStatus != null and param.checkStatus == 'NONE' ">AND CHECK_STATUS_ = 'NONE'</if>
</where>
AND RECORD_STATUS_ != 'DEL'
- AND RECORD_STATUS_ != 'ERROR'
ORDER BY REGISTER_TIME_
</select>
@@ -153,4 +151,40 @@
ORDER BY UPDATE_TIME_
</select>
+ <!--鍒嗛〉鑾峰彇鍖栭獙鏁版嵁-->
+ <select id="inoutDataByCheckId" resultType="com.ld.igds.inout.dto.InoutCheckData"
+ parameterType="com.ld.igds.inout.dto.InoutCheckParam">
+ select
+ ID_ as id,
+ COMPANY_ID_ as companyId,
+ DEPT_ID_ as deptId,
+ TYPE_ as type,
+ PROGRESS_ as progress,
+ RECORD_STATUS_ as recordStatus,
+ INTEL_CARD_ as intelCard,
+ REGISTER_TIME_ as registerTime,
+ REGISTER_USER_ as registerUser,
+ DEPOT_ID_ as depotId,
+ FOOD_VARIETY_ as foodVariety,
+ FOOD_LEVEL_ as foodLevel,
+ PRICE_ as price,
+ PLATE_NUM_ as plateNum,
+ SAMPLE_USER_ as sampleUser,
+ SAMPLE_TIME_ as sampleTime,
+ CHECK_USER_ as checkUser,
+ CHECK_TIME_ as checkTime,
+ CHECK_ID_ as checkId,
+ CHECK_STATUS_ AS checkStatus,
+ REMARKS_ AS remarks
+ from
+ D_INOUT_RECORD
+ <where>
+ <if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</if>
+ <if test="param.checkId != null and param.checkId != '' ">AND CHECK_ID_ = #{param.checkId}</if>
+ <if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
+ </where>
+ AND RECORD_STATUS_ != 'DEL'
+ ORDER BY REGISTER_TIME_
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3