From aea7379082d3a9d53a35f62e8ff435254be8d213 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 04 十一月 2025 19:46:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml
index d6b7a5d..ab2c8e4 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml
@@ -207,8 +207,8 @@
<select id="queryHollowbigStorageCageDetail" resultType="com.mes.base.entity.vo.BigStorageVO">
select hbsc.device_id, hbsc.slot, count(hbscd.glass_id) as count
from hollow_big_storage_cage hbsc
- left join hollow_big_storage_cage_details hbscd
- on hbsc.slot = hbscd.slot and hbscd.state in (100, 102, 103, 104)
+ left join hollow_big_storage_cage_details hbscd
+ on hbsc.slot = hbscd.slot and hbscd.state in (100, 102, 103, 104)
group by hbsc.device_id, hbsc.slot
order by hbsc.device_id, hbsc.slot
</select>
@@ -269,7 +269,7 @@
AND films_id LIKE CONCAT( '%', #{filmsId}, '%')
</if>
<if test="thickness != 0">
- AND thickness = #{thickness}
+ AND thickness = #{thickness}
</if>
),
hollow_details_temp AS (
@@ -293,7 +293,7 @@
AND films_id LIKE CONCAT( '%', #{filmsId}, '%')
</if>
<if test="thickness != 0">
- AND thickness = #{thickness}
+ AND thickness = #{thickness}
</if>
),
hollow_through_temp AS ( SELECT flow_card_id, MIN( hollow_sequence ) AS hollow_sequence, MAX( total_layer ) AS
@@ -416,6 +416,32 @@
ORDER BY
t.flow_card_id
</select>
+ <select id="queryVerticalSheetCageDetailsList"
+ resultType="com.mes.hollow.entity.vo.HollowBigCageDetailsVO">
+ SELECT t.id,t.device_id,t.slot,t.remain_width ,t.enable_state,t1.virtual_slot,total_layer,t1.engineer_id,
+ t1.id as detail_id,t1.device_id as detail_device_id ,t1.slot as
+ detail_slot,t1.engineer_id,t1.glass_id,t1.tempering_layout_id,t1.tempering_feed_sequence,
+ t1.flow_card_id,t1.layer,t1.width,t1.height,t1.thickness,t1.films_id
+ FROM hollow_big_storage_cage t
+ left join hollow_big_storage_cage_details t1 on t.slot = t1.slot
+ and t1.state in (100, 102, 103, 104)
+ <if test="filmsId != null and filmsId != ''">
+ and t1.films_id like CONCAT('%', #{filmsId}, '%')
+ </if>
+ <if test="flowCardId != null and flowCardId != ''">
+ and t1.flow_card_id like CONCAT('%', #{flowCardId}, '%')
+ </if>
+ <if test="engineerId != null and engineerId != ''">
+ and t1.engineer_id like CONCAT('%', #{engineerId}, '%')
+ </if>
+ <if test="glassId != null and glassId != ''">
+ and t1.glass_id like CONCAT('%', #{glassId}, '%')
+ </if>
+ <if test="thickness != -1">
+ and t1.thickness = #{thickness}
+ </if>
+ order by t.slot
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0