From 5a0b47f515ceef0ce135dd91eb7d8ba49754a570 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 12 八月 2025 16:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 985cfc1..f8bac5c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -435,9 +435,9 @@
ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
e.other_columns,
- if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
- ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
- od.building_number) as s01Value
+ if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(e.other_columns, '$.S01')),'')!='',
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(e.other_columns, '$.S01')),''),
+ e.building_number) as s01Value,
IF(count(pl.id)>0,'宸茶ˉ鐗�','') as patchStatusOther,
<if test="nextProcess != null and nextProcess != ''"> -- 闈炴渶鍚庝竴閬撳伐搴�
@@ -930,6 +930,11 @@
SELECT * FROM sd.basic_data
WHERE basic_type='product' AND basic_category='process' AND basic_name='閽㈠寲'
+
+ UNION
+
+ SELECT * FROM sd.basic_data
+ WHERE basic_type='product' AND basic_category='process' AND basic_name='鐑集'
) AS combined_results;
</select>
--
Gitblit v1.8.0