From 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 三月 2025 09:14:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 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 db5ea34..598871b 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -71,6 +71,9 @@
<if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
and fol.quantity regexp #{finishedOperateLog.quantity}
</if>
+ <if test="finishedOperateLog.processId != null and finishedOperateLog.processId != ''">
+ and fol.process_id regexp #{finishedOperateLog.processId}
+ </if>
<if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
and fol.operator regexp #{finishedOperateLog.operator}
</if>
@@ -813,40 +816,63 @@
o.customer_name,
o.project,
fol.remarks,
- fol.quantity
+ SUM(fol.quantity) as quantity,
+ ROUND( sum(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
where
- o.order_id=#{orderId} and fol.process_id=#{processId} and fol.remarks=#{remarks}
+ o.order_id=#{orderId} 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
+ group by fol.remarks,od.order_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
+ 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
+ ( 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
+ WHERE
+ o.order_id=#{orderId} and fol.remarks=#{remarks}
ORDER BY
fol.operate_time DESC
- LIMIT 50
+
</select>
+
+ <select id="getSelectStorageRecordDeliveryId" resultMap="selectFinishedGoodsInventory">
+ select fol.id,
+ fol.operation_order_number,
+ fol.order_id,
+ fol.operate_type,
+ fol.process_id,
+ fol.operation_number,
+ fol.quantity,
+ fol.operator,
+ od.product_id,
+ od.product_name,
+ od.width,
+ od.height,
+ fol.operate_time,
+ fol.`status`,
+ fol.is_state,
+ fol.reviewed,
+ fol.reviewed_time,
+ fol.type,
+ fol.remarks
+ from (select *
+ from mm.finished_operate_log aa where aa.operate_type = #{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 fol.operation_order_number=#{deliveryId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0