From af7f09e7965887b034c9add213bf68c816f22338 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 19 九月 2025 18:02:36 +0800
Subject: [PATCH] 中空理片笼缺片详情改造，中空一线二线三线页面改造
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
index ceeea23..a974a5d 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
@@ -18,7 +18,8 @@
<result column="first_length" property="width"/>
<result column="second_Length" property="height"/>
<result column="thickness" property="thickness"/>
- <result column="lack_cout" property="lackCount"/>
+ <result column="lack_count" property="lackCount"/>
+ <result column="damage_count" property="damageCount"/>
</resultMap>
<select id="queryFlowCardIdMaxLayerGlassInfo" resultMap="baseMap">
@@ -121,17 +122,36 @@
where flow_card_id = #{flowCardId}
and tempering_layout_id is null
and tempering_feed_sequence is null
- )
- select flow_card_id,
- layer,
- order_sort,
- first_length,
- films_id,
- second_Length,
- thickness,
- count(*) as lack_cout
- from relation_length
- group by flow_card_id, layer, order_sort, films_id, first_length, second_Length, thickness
+ ),
+ lack_count_temp as (
+ select flow_card_id,
+ layer,
+ order_sort,
+ first_length,
+ films_id,
+ second_Length,
+ thickness,
+ count(*) as lack_count
+ from relation_length
+ group by flow_card_id, layer, order_sort, films_id, first_length, second_Length, thickness
+ ),
+ damage_count_temp as (
+ select process_id as flow_card_id,
+ technology_number as layer,
+ order_number as order_sort,
+ count(1) as damage_count
+ from damage
+ where process_id = #{flowCardId} and type in (8,9) and status < 3
+ group by process_id, technology_number, order_number
+ ),
+ result_count as (
+ select t.*, IFNULL(t1.damage_count, 0) damage_count
+ from lack_count_temp t
+ left join damage_count_temp t1 on t.flow_card_id = t1.flow_card_id and t.layer = t1.layer and
+ t.order_sort = t1.order_sort
+ )
+ select *
+ from result_count
</select>
<select id="queryLayerByFlowCardId" resultType="java.lang.Integer">
select count(distinct layer)
--
Gitblit v1.8.0