From 2a891d0391bc9f2dfaaaee8f63fcb20ff0932202 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 七月 2024 15:11:40 +0800
Subject: [PATCH] 修改订单报表
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 9e995ba..648fe20 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -194,7 +194,8 @@
odpd.broken_num as onceBroken,
ogd.`group`,
if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- od.other_columns
+ od.other_columns,
+ ogd.id as 'glassId'
FROM
sd.order_detail AS od
@@ -209,6 +210,7 @@
and technology_number =#{technologyStr}
limit 1)
</if>
+
LEFT JOIN flow_card AS fc
ON fc.order_id = ogd.order_id
@@ -287,7 +289,7 @@
right join (
select distinct process,teams from
( select distinct rw.this_process as process,rw.teams_groups_name as teams
- from reporting_work as rw where rw.process_id=#{processIdStr}
+ from reporting_work as rw where rw.process_id=#{processIdStr} and rw.reviewed_state>=0
) as t
) as rw
--
Gitblit v1.8.0