From 09bde4a5ee4bf572eae5c005c1896a92868b003b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 05 三月 2025 16:14:07 +0800
Subject: [PATCH] 添加订单报工报表以及跳转流程卡进度报表
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 5d3fedf..3546aea 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2858,7 +2858,7 @@
</select>
<select id="flowCardToOptimizeCount">
- select count(*) from pp.flow_card where order_id = #{orderId} and engineering_occupancy=1
+ select count(*) from pp.flow_card where order_id = #{orderId} and project_no is not null
</select>
<select id="getFlowCardDetail" >
@@ -2938,7 +2938,7 @@
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
od.order_number,
ogd.child_width as width,
- ogd.child_height as height,
+ ogd.child_height as height
from sd.order_glass_detail as ogd
left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
left join sd.`order` as o on o.order_id = ogd.order_id
--
Gitblit v1.8.0