From a3ad909e75ddb7a6271d95704dc002cc70337fd5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 27 十月 2025 11:07:45 +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 | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 200ae3a..b0c1173 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -36,6 +36,7 @@
<result column="project" property="order.project"/>
<result column="customer_name" property="order.customerName"/>
<result column="customer_Id" property="order.customerId"/>
+ <result column="order_type" property="order.orderType"/>
</resultMap>
@@ -483,7 +484,8 @@
fol.money,
o.customer_name,
o.project,
- od.price
+ od.price,
+ o.order_type
from (select *
from mm.finished_operate_log aa where aa.status!='宸蹭綔搴�') fol
left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
@@ -552,6 +554,9 @@
</if>
<if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
and od.price regexp #{finishedOperateLog.orderDetail.price}
+ </if>
+ <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.orderType != null and finishedOperateLog.order.orderType != '')">
+ and o.order_type regexp #{finishedOperateLog.order.orderType}
</if>
</where>
order by fol.`status` desc
@@ -629,6 +634,9 @@
</if>
<if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
and od.price regexp #{finishedOperateLog.orderDetail.price}
+ </if>
+ <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.orderType != null and finishedOperateLog.order.orderType != '')">
+ and o.order_type regexp #{finishedOperateLog.order.orderType}
</if>
</where>
</select>
@@ -773,7 +781,8 @@
fol.money,
o.customer_name,
o.project,
- od.price
+ od.price,
+ o.order_type
from (select *
from mm.finished_operate_log aa where aa.status!='宸蹭綔搴�') fol
left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
@@ -1067,4 +1076,6 @@
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