From bb85dbc5fc9a9ddda99132ae16887fd27959a854 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 06 一月 2025 16:18:48 +0800
Subject: [PATCH] 补充注释、语言，转工单时添加未勾选数据时的弹窗，修改报工新增查询复合工序不能查询出每一层的问题，修改次破报表响应超时问题
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 7fc144f..8dda058 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -89,6 +89,28 @@
f.order_number;
</select>
+ <!--宸ョ▼淇℃伅娴佺▼鍗�-->
+ <select id="getProcessCardMp">
+ SELECT
+ fc.process_id,
+ fc.order_number,
+ fc.quantity,
+ CONCAT(fc.technology_number, '/', COUNT(fc.technology_number)) AS layer,
+ so.project,
+ CONCAT(sd.child_width, ' 脳 ', sd.child_height) AS sizes
+ FROM
+ pp.flow_card AS fc
+ INNER JOIN sd.order AS so ON fc.order_id = so.order_id
+ INNER JOIN sd.order_glass_detail AS sd ON sd.order_id = so.order_id AND fc.order_id = sd.order_id
+ AND fc.order_number = sd.order_number
+ WHERE
+ fc.project_no = #{projectNo}
+ GROUP BY
+ fc.order_id,
+ fc.technology_number,
+ fc.order_number
+ </select>
+
<!--搴撳瓨淇℃伅-->
<select id="materialStoreMp">
SELECT
--
Gitblit v1.8.0