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/OrderMapper.xml | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
index 26b158e..b2c0fdf 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
@@ -152,4 +152,34 @@
and a.process = "涓┖"
and (b.quantity - b.termination_quantity) > reporting_work_num
</select>
+
+
+ <select id="queryInterlayerByERP" resultType="com.mes.order.entity.dto.InterlayerDTO">
+ WITH flow_order AS (
+ SELECT ORDER_ID, ORDER_NUMBER
+ FROM pp.flow_card
+ WHERE process_id = #{flowCardId}
+ ORDER BY ORDER_NUMBER /* 娣诲姞閫傚綋鐨勬帓搴忓瓧娈碉紝纭繚缁撴灉纭畾鎬� */
+ LIMIT 1
+ ),
+ product_ids AS (
+ SELECT od.PRODUCT_ID
+ FROM sd.order_detail od
+ inner JOIN flow_order fo ON od.ORDER_id = fo.ORDER_ID AND od.ORDER_NUMBER = fo.ORDER_NUMBER
+ ),
+ ranked AS (
+ SELECT
+ detail_type,
+ LAG(glass_sort) OVER (PARTITION BY prod_id ORDER BY sort_num) AS prev_sort,
+ LEAD(glass_sort) OVER (PARTITION BY prod_id ORDER BY sort_num) AS next_sort
+ FROM sd.product_detail
+ WHERE prod_id IN (SELECT PRODUCT_ID FROM product_ids)
+
+ )
+ SELECT
+ prev_sort,
+ next_sort
+ FROM ranked
+ where detail_type = 'Interlayer'
+ </select>
</mapper>
--
Gitblit v1.8.0