From 06194b3e0d44516b00540e517d58ecfaa286c59d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 10 十月 2025 08:12:22 +0800
Subject: [PATCH] 1、结束功能从删除工程表信息改为将工程状态修改为6 2、中空大理片笼界面破损详情添加每片玻璃的破损

---
 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
index f59fda8..b3edaa2 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
@@ -139,18 +139,18 @@
                  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
+                 select process_id                                                                     as flow_card_id,
+                        technology_number                                                              as layer,
+                        order_number                                                                   as order_sort,
+                        count(distinct
+                              case when type = 8 and status &lt; 3 then glass_id else null end)        as damage_count,
+                        count(distinct case when type = 8 and status >= 3 then glass_id else null end) as patch_count
                  from damage
                  where process_id in (select flow_card_id from flow_card_id_info)
-                   and type in (8, 9)
-                   and status &lt; 3
                  group by process_id, technology_number, order_number
              ),
              result_count as (
-                 select t.*, IFNULL(t1.damage_count, 0) damage_count
+                 select t.*, IFNULL(t1.damage_count, 0) damage_count, IFNULL(t1.patch_count, 0) patch_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
@@ -181,6 +181,20 @@
         )
         limit 1
     </select>
+    <select id="queryLackGlassByFlowCard" resultType="com.mes.glassinfo.entity.GlassInfo">
+        with glass_id_info as (
+        select glass_id,order_sort from hollow_glass_relation_info where flow_card_id=#{flowCardId} and
+        order_sort=#{orderSort} and layer=#{layer} and glass_id is not null
+        ),
+        damage_glass_id as (
+        select glass_id from damage where process_id=#{flowCardId} and order_number=#{orderSort} and
+        technology_number=#{layer} and type=8 and status &lt; 3 and glass_id is not null
+        )
+        select t.* from glass_info t left join glass_id_info t1 on t.glass_id=t1.glass_id
+        left join damage_glass_id t2 on t.glass_id=t2.glass_id
+        where t.flow_card_id=#{flowCardId} and t.glass_type=#{orderSort} and t.layer=#{layer} and t1.glass_id is null
+        and t2.glass_id is null
+    </select>
 
     <update id="clearDirtyFlowCardData">
         update hollow_glass_relation_info

--
Gitblit v1.8.0