From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 2ac1a8d..672a9b3 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -21,6 +21,8 @@
<result column="remarks" property="remarks"/>
<result column="is_state" property="isState"/>
<result column="process_id" property="processId"/>
+ <result column="money" property="money"/>
+ <result column="area" property="area"/>
<result column="width" property="orderDetail.width"/>
<result column="height" property="orderDetail.height"/>
@@ -30,6 +32,8 @@
<result column="project" property="order.project"/>
<result column="customer_name" property="order.customerName"/>
<result column="delivery_address" property="order.deliveryAddress"/>
+ <result column="project" property="order.project"/>
+ <result column="customer_name" property="order.customerName"/>
</resultMap>
@@ -52,7 +56,11 @@
fol.reviewed,
fol.reviewed_time,
fol.type,
- fol.remarks
+ fol.remarks,
+ fol.area,
+ fol.money,
+ o.customer_name,
+ o.project
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
@@ -106,6 +114,18 @@
</if>
<if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
and fol.remarks regexp #{finishedOperateLog.remarksr}
+ </if>
+ <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
+ and fol.area regexp #{finishedOperateLog.area}
+ </if>
+ <if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
+ and fol.money regexp #{finishedOperateLog.money}
+ </if>
+ <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
+ and o.customer_name regexp #{finishedOperateLog.order.customerName}
+ </if>
+ <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.project != null and finishedOperateLog.order.project != '')">
+ and o.project regexp #{finishedOperateLog.order.project}
</if>
</where>
order by fol.operate_time desc
@@ -164,6 +184,18 @@
</if>
<if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
and fol.remarks regexp #{finishedOperateLog.remarksr}
+ </if>
+ <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
+ and fol.area regexp #{finishedOperateLog.area}
+ </if>
+ <if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
+ and fol.money regexp #{finishedOperateLog.money}
+ </if>
+ <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
+ and o.customer_name regexp #{finishedOperateLog.order.customerName}
+ </if>
+ <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.project != null and finishedOperateLog.order.project != '')">
+ and o.project regexp #{finishedOperateLog.order.project}
</if>
</where>
order by fol.`status` desc
@@ -574,10 +606,13 @@
quantity,
operate_time,
status,
- remarks
+ remarks,
+ money,
+ area
)
values (
- #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},#{flowCard.inventoryQuantity},now(),"鏈鏍�",#{container}
+ #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},
+ #{flowCard.inventoryQuantity},now(),"鏈鏍�",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
)
</insert>
@@ -837,6 +872,7 @@
fol.remarks,
SUM(fol.quantity) as quantity,
ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,
+ ROUND( sum(od.width * od.height * fol.quantity*p.total_thickness*2.5) / 1000000, 2 ) as weight,
fol.process_id,
aaa.teams_groups_name,
aaa.previous_process,
@@ -845,6 +881,7 @@
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
+ 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
--
Gitblit v1.8.0