From 5a07bb3f4e4846ac5425b5ec73d4017e2b7c57dd Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 16 四月 2026 12:44:40 +0800
Subject: [PATCH] erp上报完成时间修复
---
src/main/resources/mapper/BasDevpMapper.xml | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 9d69db5..2c1a84a 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -27,8 +27,15 @@
<result column="row1" property="row1" />
<result column="io_time" property="ioTime" />
<result column="area" property="area" />
+ <result column="in_first_crn_csv" property="inFirstCrnCsv" />
+ <result column="in_second_crn_csv" property="inSecondCrnCsv" />
+ <result column="in_first_crn_current_no" property="inFirstCrnCurrentNo" />
+ <result column="in_second_crn_current_no" property="inSecondCrnCurrentNo" />
<result column="in_ok" property="inOk" />
<result column="out_ok" property="outOk" />
+ <result column="loc_type1" property="locType1" />
+ <result column="loc_type2" property="locType2" />
+ <result column="loc_type3" property="locType3" />
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
@@ -41,16 +48,26 @@
</resultMap>
- <select id="getAvailableDevp" resultType="java.lang.Integer">
+ <select id="getAvailableInSite" resultType="java.lang.Integer">
select
abd.dev_no
from asr_bas_devp abd
left join asr_sta_desc asd on abd.dev_no = asd.stn_no
where 1=1
- and asd.type_no = 1
- and abd.in_enable = 'Y'
+ and asd.type_no = #{typeNo}
+ -- and abd.in_enable = 'Y'
group by abd.dev_no
+ </select>
+ <select id="getAvailableOutSite" resultType="java.lang.Integer">
+ select
+ abd.dev_no
+ from asr_bas_devp abd
+ left join asr_sta_desc asd on abd.dev_no = asd.stn_no
+ where 1=1
+ and asd.type_no = #{typeNo}
+ -- and abd.out_enable = 'Y'
+ group by abd.dev_no
</select>
</mapper>
--
Gitblit v1.9.1