From 26caccd05881f23189bdc8cc4db892e2b789e57d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 04 九月 2025 13:47:10 +0800
Subject: [PATCH] 1、中空调整:定任务优先级可控,界面新增按钮 2、中空缺片详情报破损功能以实现

---
 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
index 286e3ff..ceeea23 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml
@@ -13,6 +13,7 @@
     <resultMap id="lackBaseMap" type="com.mes.hollow.entity.dto.LackDetailsDTO">
         <result column="flow_card_id" property="flowCardId"/>
         <result column="layer" property="layer"/>
+        <result column="order_sort" property="glassType"/>
         <result column="films_id" property="filmsId"/>
         <result column="first_length" property="width"/>
         <result column="second_Length" property="height"/>
@@ -107,6 +108,7 @@
         with relation_length as (
             select flow_card_id,
                    layer,
+                   order_sort,
                    tempering_layout_id,
                    tempering_feed_sequence,
                    GREATEST(width, height) as first_length,
@@ -120,9 +122,16 @@
               and tempering_layout_id is null
               and tempering_feed_sequence is null
         )
-        select flow_card_id, layer, first_length, films_id, second_Length, thickness, count(*) as lack_cout
+        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, films_id, first_length, second_Length, thickness
+        group by flow_card_id, layer, order_sort, films_id, first_length, second_Length, thickness
     </select>
     <select id="queryLayerByFlowCardId" resultType="java.lang.Integer">
         select count(distinct layer)

--
Gitblit v1.8.0