From 74fd6eb7fb0322078f7946f51073f20e90231df1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 01 四月 2025 11:54:00 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/BasDevpMapper.xml | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 303d769..ef54ea6 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -29,6 +29,9 @@
<result column="area" property="area" />
<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" />
@@ -38,6 +41,8 @@
<result column="max_wt" property="maxWt" />
<result column="gross_wt" property="grossWt" />
<result column="cart_pos" property="cartPos" />
+ <result column="report_sign" property="reportSign" />
+ <result column="empty_mk" property="emptyMk" />
</resultMap>
@@ -47,8 +52,8 @@
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>
@@ -58,9 +63,21 @@
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 = 110
- and abd.out_enable = 'Y'
+ and asd.type_no = #{typeNo}
+ -- and abd.out_enable = 'Y'
group by abd.dev_no
</select>
+ <select id="selectWaitNecessary" resultType="java.lang.Integer">
+ select count(1)
+ from asr_bas_devp
+ where 1=1
+ and dev_no in
+ <foreach item="item" collection="devNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ and wrk_no is not null and wrk_no!=0 and wrk_no != #{wrkNo}
+
+ </select>
+
</mapper>
--
Gitblit v1.9.1