From ce06fcc3113dc45647910deef0e4adeaa97bfa3f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 15 十月 2025 13:32:40 +0800
Subject: [PATCH] 语言修改
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 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 e9757b9..200ae3a 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -95,7 +95,7 @@
and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
</if>
<if test="finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
- and od.price regexp #{finishedOperateLog.orderDetail.price}
+ and od.price regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.price},'\\.0+$','')
</if>
<if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
@@ -122,10 +122,10 @@
and fol.remarks regexp #{finishedOperateLog.remarks}
</if>
<if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
- and fol.area regexp #{finishedOperateLog.area}
+ and fol.area regexp REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')
</if>
<if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
- and fol.money regexp #{finishedOperateLog.money}
+ and fol.money regexp REGEXP_REPLACE(#{finishedOperateLog.money},'\\.0+$','')
</if>
<if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
and o.customer_name regexp #{finishedOperateLog.order.customerName}
@@ -159,6 +159,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>
@@ -169,7 +172,7 @@
and od.product_name regexp #{finishedOperateLog.orderDetail.productName}
</if>
<if test="finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
- and od.price regexp #{finishedOperateLog.orderDetail.price}
+ and od.price regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.price},'\\.0+$','')
</if>
<if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
and od.width regexp REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
@@ -196,10 +199,10 @@
and fol.remarks regexp #{finishedOperateLog.remarks}
</if>
<if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
- and fol.area regexp #{finishedOperateLog.area}
+ and fol.area regexp REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')
</if>
<if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
- and fol.money regexp #{finishedOperateLog.money}
+ and fol.money regexp REGEXP_REPLACE(#{finishedOperateLog.money},'\\.0+$','')
</if>
<if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
and o.customer_name regexp #{finishedOperateLog.order.customerName}
@@ -655,7 +658,8 @@
status,
remarks,
money,
- area
+ area,
+ compute_area
)
values (
#{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},
@@ -666,7 +670,7 @@
<if test="createTime == null">
now()
</if>
- ,"鏈鏍�",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
+ ,"鏈鏍�",#{container},#{deliveryDetailMoney},#{deliveryDetailArea},#{getComputeArea}
)
</insert>
@@ -680,11 +684,12 @@
quantity,
operate_time,
status,
- remarks
+ remarks,
+ area
)
values (
#{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}
- ,"鍑哄簱",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"鏈鏍�",#{boxNo}
+ ,"鍑哄簱",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"鏈鏍�",#{boxNo},#{orderDetail.deliveryDetail.area}
)
</insert>
@@ -786,10 +791,14 @@
operator,
quantity,
operate_time,
- status
+ status,
+ area,
+ compute_area,
+ remarks
)
values (
- #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"鍏ュ簱",#{userName},#{orderDetail.quantity},now(),"鏈鏍�"
+ #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"鍏ュ簱",#{userName},#{orderDetail.quantity},now(),"鏈鏍�",
+ #{orderDetail.computeGrossArea},#{orderDetail.computeArea},""
)
</insert>
@@ -943,7 +952,8 @@
o.batch,
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) / 1000000, 2 ) as area,*/
+ fol.area 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,
@@ -996,7 +1006,8 @@
sum(fol.quantity) as quantity,
od.product_name,
od.product_id,
- ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 ) as area,
+ /*ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 ) as area,*/
+ ROUND(sum(fol.compute_area * fol.quantity) , 2 ) as area,
ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 )*#{thickness}*2.5 as weight
FROM
( SELECT * FROM mm.finished_operate_log aa WHERE aa.operate_type = '鍏ュ簱' AND aa.STATUS != '宸蹭綔搴�' ) fol
--
Gitblit v1.8.0