From a6f59f0908e5787d55c098c17f4eec365cf6477a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 23 十一月 2024 11:41:25 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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 62074e6..db5ea34 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -808,7 +808,45 @@
</select>
+<select id="getPrimaryListLimt">
+ select o.order_id,
+ o.customer_name,
+ o.project,
+ fol.remarks,
+ fol.quantity
+ from (select *
+ from mm.finished_operate_log aa where aa.operate_type = '鍏ュ簱' and aa.status!='宸蹭綔搴�') fol
+ 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
+ where
+ o.order_id=#{orderId} and fol.process_id=#{processId} and fol.remarks=#{remarks}
+ and (fol.remarks is not null and fol.remarks !="") and (fol.process_id !="" and fol.process_id is not null)
+
+ group by fol.remarks,od.order_id,fol.process_id
+ order by fol.operate_time desc
+</select>
+
+<select id="getDetailList">
+ SELECT
+ od.building_number,
+ od.width,
+ od.height,
+ fol.quantity,
+ ROUND(od.width * od.height * fol.quantity / 1000000, 2) AS area
+ FROM
+ (SELECT * FROM mm.finished_operate_log aa WHERE aa.operate_type = '鍏ュ簱' AND aa.STATUS != '宸蹭綔搴�') fol
+ 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
+ JOIN
+ (SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4
+ UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7
+ UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL SELECT 10) n
+ ORDER BY
+ fol.operate_time DESC
+ LIMIT 50
+</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0