From 939ccc9c254870ed15cdd485b9d303bbb00a23f2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 14:16:27 +0800
Subject: [PATCH] 注释加上上海玻璃公司ip
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 91 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 15 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 836847a..4b0a927 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -35,6 +35,7 @@
<result column="delivery_address" property="order.deliveryAddress"/>
<result column="project" property="order.project"/>
<result column="customer_name" property="order.customerName"/>
+ <result column="customer_Id" property="order.customerId"/>
</resultMap>
@@ -94,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+$','')
@@ -121,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}
@@ -158,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>
@@ -168,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+$','')
@@ -195,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}
@@ -474,10 +478,16 @@
fol.reviewed,
fol.reviewed_time,
fol.type,
- fol.remarks
+ fol.remarks,
+ fol.area,
+ fol.money,
+ o.customer_name,
+ o.project,
+ od.price
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
+ left join sd.`order` o on o.order_id=fol.order_id
<where>
date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate} and fol.operate_type=#{type}
<if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
@@ -527,6 +537,21 @@
</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 REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')
+ </if>
+ <if test="finishedOperateLog.money != null and 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}
+ </if>
+ <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.project != null and finishedOperateLog.order.project != '')">
+ and o.project regexp #{finishedOperateLog.order.project}
+ </if>
+ <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
+ and od.price regexp #{finishedOperateLog.orderDetail.price}
</if>
</where>
order by fol.`status` desc
@@ -539,6 +564,7 @@
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
+ left join sd.`order` o on o.order_id=fol.order_id
<where>
date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate} and fol.operate_type=#{type}
<if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
@@ -588,6 +614,21 @@
</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 REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')
+ </if>
+ <if test="finishedOperateLog.money != null and 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}
+ </if>
+ <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.project != null and finishedOperateLog.order.project != '')">
+ and o.project regexp #{finishedOperateLog.order.project}
+ </if>
+ <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
+ and od.price regexp #{finishedOperateLog.orderDetail.price}
</if>
</where>
</select>
@@ -621,7 +662,15 @@
)
values (
#{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},
- #{flowCard.inventoryQuantity},now(),"鏈鏍�",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
+ #{flowCard.inventoryQuantity},
+ <if test="createTime != null">
+ #{createTime}
+ </if>
+ <if test="createTime == null">
+ now()
+ </if>
+ ,"鏈鏍�",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
+
)
</insert>
@@ -633,11 +682,13 @@
operator,
quantity,
operate_time,
- status
+ status,
+ remarks,
+ area
)
values (
#{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}
- ,"鍑哄簱",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"鏈鏍�"
+ ,"鍑哄簱",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"鏈鏍�",#{boxNo},#{orderDetail.deliveryDetail.area}
)
</insert>
@@ -716,10 +767,16 @@
fol.reviewed,
fol.reviewed_time,
fol.type,
- fol.remarks
+ fol.remarks,
+ fol.area,
+ fol.money,
+ o.customer_name,
+ o.project,
+ od.price
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
+ left join sd.`order` o on o.order_id=fol.order_id
where date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) <= #{dates[1]} and fol.operate_type=#{type}
</select>
@@ -759,6 +816,7 @@
od.height,
o.project,
o.customer_name,
+ o.customer_Id,
o.delivery_address,
fol.operate_time,
fol.`status`,
@@ -853,7 +911,9 @@
and fol.remarks regexp #{finishedOperateLog.remarks}
</if>
</where>
- group by fol.remarks,od.order_id,fol.process_id) as zu
+ group by fol.remarks,od.order_id
+ -- ,fol.process_id
+ ) as zu
</select>
@@ -882,6 +942,7 @@
select kkk.*,rw.teams_groups_name as teams_groups_name2 from(select o.order_id,
o.customer_name,
+ o.customer_id,
o.project,
o.batch,
fol.remarks,
@@ -902,13 +963,13 @@
where
- o.customer_name=#{customerName} and fol.remarks=#{remarks} and o.project=#{project}
+ o.customer_id=#{customerId} and fol.remarks=#{remarks} and o.project=#{project}
and (fol.remarks is not null and fol.remarks !="") and (fol.process_id !="" and fol.process_id is not null)
group by fol.remarks,o.customer_name,o.project
) as kkk
left join pp.reporting_work rw on rw.process_id=kkk.process_id and rw.this_process=kkk.previous_process
- group by kkk.remarks,kkk.customer_name,kkk.project
+ group by kkk.remarks,kkk.customer_id,kkk.project
</select>
@@ -950,7 +1011,7 @@
o.order_id=#{orderId} and fol.remarks=#{remarks} and od.product_id=#{productId}
group by od.order_id,od.order_number
ORDER BY
- fol.operate_time DESC
+ od.order_number
</select>
--
Gitblit v1.8.0