From 6fac4cbed12a84473e8eab217abacc221dedca9f Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 28 七月 2025 14:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index e2ea540..1af63db 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -803,7 +803,8 @@
and fol.remarks regexp #{finishedOperateLog.remarksr}
</if>
</where>
- group by fol.remarks,od.order_id,fol.process_id
+ group by fol.remarks,od.order_id
+ -- ,fol.process_id
order by fol.operate_time desc
limit #{offset},#{pageSize};
</select>
@@ -890,7 +891,7 @@
left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
left join sd.`order` o on o.order_id=fol.order_id
left join sd.product p on od.product_id=p.id
- left join (select teams_groups_name,process_id,previous_process,reporting_work_time from pp.reporting_work where this_process='鍖呰') aaa on aaa.process_id=fol.process_id
+ left join (select teams_groups_name,process_id,previous_process,reporting_work_time from pp.reporting_work where this_process='鍖呰' group by process_id) aaa on aaa.process_id=fol.process_id
@@ -926,8 +927,7 @@
<select id="getDetailLists">
SELECT
- od.building_number,
- od.other_columns,
+ ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
od.width,
od.height,
fol.quantity,
--
Gitblit v1.8.0