From 66d9a37adfa32014d479ae1e67575d2392084676 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 12 九月 2025 09:05:51 +0800
Subject: [PATCH] 1、大屏动画修改
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
index 41072b0..c6f3db9 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
@@ -178,9 +178,53 @@
b.tempering_feed_sequence
from down_glass_info a
inner join glass_info b on a.glass_id = b.glass_id
- where a.flow_card_id = #{processId}
- and a.layer = #{technologyNumber}
- group by a.flow_card_id, a.layer, a.width, a.height, a.filmsid, a.thickness, a.glass_type, a.id
+ where
+ 1=1
+ <if test="processId != null">
+ and a.flow_card_id = #{processId}
+ </if>
+ <if test="technologyNumber != null">
+ and a.layer = #{technologyNumber}
+ </if>
+ <if test="glassIds != null and !glassIds.isEmpty()">
+ and a.glass_id in
+ <foreach collection="glassIds" item="item" open="(" close=")" separator=",">
+ #{item} <!-- 杩欓噷 MyBatis 浼氳嚜鍔ㄥ鐞嗗瓧绗︿覆 -->
+ </foreach>
+
+ </if>
+ group by a.glass_id, a.flow_card_id, a.layer, a.width, a.height, a.filmsid, a.thickness, a.glass_type
+ order by a.id
+ </select>
+
+ <select id="downGlassLabelPrintScan" resultType="java.util.Map">
+ select a.flow_card_id,
+ a.layer,
+ a.width,
+ a.height,
+ a.filmsid,
+ a.thickness,
+ a.glass_type,
+ COUNT(*) AS quantity,
+ a.tempering_layout_id,
+ a.tempering_feed_sequence
+ from glass_info a
+ where
+ 1=1
+ <if test="processId != null">
+ and a.flow_card_id = #{processId}
+ </if>
+ <if test="technologyNumber != null">
+ and a.layer = #{technologyNumber}
+ </if>
+ <if test="glassIds != null and !glassIds.isEmpty()">
+ and a.glass_id in
+ <foreach collection="glassIds" item="item" open="(" close=")" separator=",">
+ #{item} <!-- 杩欓噷 MyBatis 浼氳嚜鍔ㄥ鐞嗗瓧绗︿覆 -->
+ </foreach>
+
+ </if>
+ group by a.glass_id, a.flow_card_id, a.layer, a.width, a.height, a.filmsid, a.thickness, a.glass_type
order by a.id
</select>
--
Gitblit v1.8.0