From b804d88d626d1df675a3278c859b37758c55432b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 13:42:06 +0800
Subject: [PATCH] 1、增加流程卡进度查询，可根据工程号，流程卡号，玻璃id查看进度情况 2、钢化界面增加颜色对应注释，版图增加落架顺序 3、两个大理片界面笼子上色块显示修改为根据玻璃宽度显示 4、中空大理片右侧缺片情况显示优化 5、是否除膜从领取工程取消，在中空领取任务时选择除膜膜系（不除膜时不选择膜系），当配方中是需要除膜时并且选择的膜系与小片膜系一样时发送除膜信息 6、中空领取任务界面流程卡数量不等于已配对数量时高亮显示 7、磨边队列当后面玻璃磨边完成扫码但前面玻璃还未扫到码时高亮显示
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
index 56269da..e84942f 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
@@ -39,31 +39,42 @@
AND T1.SLOT IS NULL
</select>
- <select id="listBySlotState" resultMap="RawGlassStorageDetailsDTO">
+ <select id="patternUsage" resultMap="RawGlassStorageDetailsDTO">
select rgsd.pattern_width,
- rgsd.pattern_height,
- rgsd.pattern_thickness,
- rgsd.films_id,
- rgsd.count + sum(lgdth.finish_count) + sum(damage_count),
- rgsd.count,
- sum(lgdth.finish_count) as finishCount,
- sum(damage_count) as damageCount
+ rgsd.pattern_height,
+ rgsd.pattern_thickness,
+ rgsd.films_id,
+ ifnull(rgsd.count,0) + ifnull(sum(lgdth.finish_count),0) + ifnull(sum(damage_count),0) as totalCount,
+ ifnull(rgsd.count,0) as count,
+ ifnull(sum(lgdth.finish_count),0) as finishCount,
+ ifnull(sum(damage_count),0) as damageCount
from (select pattern_width,
- pattern_height,
- pattern_thickness,
- films_id,
- sum(case when state = 100 then remain_quantity else 0 end) as count
- from raw_glass_storage_details
- group by pattern_width, pattern_height, pattern_thickness, films_id) as rgsd
- left JOIN load_glass_device_task_history as lgdth
- on rgsd.pattern_width = lgdth.raw_glass_width
- and rgsd.pattern_height = lgdth.raw_glass_height
- and rgsd.pattern_thickness = lgdth.raw_glass_thickness
- and rgsd.films_id = lgdth.raw_glass_films_id
- where rgsd.pattern_width like "%#{processId}%"
- and rgsd.pattern_height like "%#{pattern_height}%"
- and rgsd.pattern_thickness like "%#{pattern_thickness}%"
- and rgsd.films_id like "%#{films_id}%"
+ pattern_height,
+ pattern_thickness,
+ films_id,
+ sum(case when state = 100 then remain_quantity else 0 end) as count
+ from raw_glass_storage_details
+ group by pattern_width, pattern_height, pattern_thickness, films_id) as rgsd
+ left JOIN load_glass_device_task_history as lgdth
+ on rgsd.pattern_width = lgdth.raw_glass_width
+ and rgsd.pattern_height = lgdth.raw_glass_height
+ and rgsd.pattern_thickness = lgdth.raw_glass_thickness
+ and rgsd.films_id = lgdth.raw_glass_films_id
+ <where>
+ 1=1
+ <if test="width != null and width != ''">
+ and rgsd.pattern_width like concat('%', #{width}, '%')
+ </if>
+ <if test="height != null and height != ''">
+ and rgsd.pattern_height like concat('%', #{height}, '%')
+ </if>
+ <if test="thickness != null and thickness != ''">
+ and rgsd.pattern_thickness like concat('%', #{thickness}, '%')
+ </if>
+ <if test="films != null and films != ''">
+ and rgsd.films_id like concat('%', #{films}, '%')
+ </if>
+ </where>
group by rgsd.pattern_width, rgsd.pattern_height, rgsd.pattern_thickness, rgsd.films_id
</select>
</mapper>
--
Gitblit v1.8.0