From 43d86830f4696c3ba2250a961d26377e1ff6cc32 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 17 十二月 2025 10:39:43 +0800
Subject: [PATCH] 1、 查询是否除膜优化

---
 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml
index cb5fb88..ce49475 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageDetailsMapper.xml
@@ -196,6 +196,13 @@
         on t.flow_card_id = t1.flow_card_id and t.hollow_sequence = t1.hollow_sequence
         where t.state = 100
         and t.flow_card_id = #{flowCardId}
+        <if test="list != null and list.size() > 0">
+            and t.layer in (
+            <foreach collection="list" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
         )
         select *
         from result_detail
@@ -269,7 +276,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 +300,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
@@ -340,7 +347,7 @@
         ),
         glass_engineer_temp AS (
         SELECT
-        flow_card_id,
+        distinct flow_card_id,
         engineer_id
         FROM
         (
@@ -416,6 +423,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