From 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 215 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 191 insertions(+), 24 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 9fba596..4607863 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -23,6 +23,7 @@
<result column="process_id" property="processId"/>
<result column="money" property="money"/>
<result column="area" property="area"/>
+ <result column="square_millimeter" property="squareMillimeter"/>
<result column="width" property="orderDetail.width"/>
<result column="height" property="orderDetail.height"/>
@@ -35,6 +36,8 @@
<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"/>
+ <result column="order_type" property="order.orderType"/>
</resultMap>
@@ -62,10 +65,23 @@
fol.money,
o.customer_name,
o.project,
- od.price
+ od.price,
+ CASE
+ WHEN #{type} = '鍏ュ簱' THEN
+ if(fgi.quantity_available>fol.quantity,fol.quantity,fgi.quantity_available)
+ ELSE
+ 0
+ END AS quantity_available,
+ CASE
+ WHEN #{type} = '鍏ュ簱' THEN
+ if(fgi.quantity_available>fol.quantity,fol.quantity,fgi.quantity_available)
+ ELSE
+ 0
+ END AS cancelAvailable
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 mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number and fgi.box_no=fol.remarks
left join sd.`order` o on o.order_id=fol.order_id
<where>
date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
@@ -94,7 +110,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 +137,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}
@@ -133,16 +149,20 @@
and o.project regexp #{finishedOperateLog.order.project}
</if>
</where>
+ group by fol.order_id,fol.operation_number,fol.remarks
order by fol.operate_time desc
limit #{offset},#{pageSize};
</select>
<select id="getSelectStorageRecordLogPageTotal">
- select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
- count(fol.id) as 'total'
+ select
+ CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
+ count(zu.id) as 'total' from (
+ select fol.id
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 mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number and fgi.box_no=fol.remarks
left join sd.`order` o on o.order_id=fol.order_id
<where>
date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
@@ -158,6 +178,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 +191,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 +218,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}
@@ -207,7 +230,9 @@
and o.project regexp #{finishedOperateLog.order.project}
</if>
</where>
+ group by fol.order_id,fol.operation_number,fol.remarks
order by fol.`status` desc
+ ) as zu
</select>
<update id="updateToExamine">
@@ -216,6 +241,11 @@
<update id="updateFinishedOperateLogState">
update mm.finished_operate_log set status=#{type} where id=#{finishedOperateLog.id};
+ </update>
+
+ <update id="updateFinishedOperateLogQuantity">
+ update mm.finished_operate_log set quantity=quantity-#{finishedOperateLog.cancelAvailable},
+ area=area-#{deliveryDetailArea},money=money-#{deliveryDetailMoney} where id=#{finishedOperateLog.id};
</update>
<select id="getSelectOperateRecord" resultMap="selectFinishedGoodsInventory">
@@ -474,12 +504,28 @@
fol.reviewed,
fol.reviewed_time,
fol.type,
- fol.remarks
+ fol.remarks,
+ fol.area,
+ fol.money,
+ o.customer_name,
+ o.project,
+ od.price,
+ o.order_type,
+ p.thickness * fol.area as square_millimeter
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
+ left join sd.product p on p.id=od.product_id
<where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate} and fol.operate_type=#{type}
+ <if test="dateType=='date'">
+ date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
+ </if>
+ <if test="dateType=='datetime'">
+ fol.operate_time>=#{startDate} and fol.operate_time <= #{endDate}
+ </if>
+ and fol.operate_type=#{type}
+
<if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
and fol.operate_type regexp #{finishedOperateLog.operateType}
</if>
@@ -527,6 +573,24 @@
</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>
+ <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
@@ -539,8 +603,18 @@
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
+ left join sd.product p on p.id=od.product_id
<where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate} and fol.operate_type=#{type}
+ <if test="dateType=='date'">
+ date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
+ </if>
+ <if test="dateType=='datetime'">
+ fol.operate_time>=#{startDate} and fol.operate_time <= #{endDate}
+ </if>
+ and fol.operate_type=#{type}
+
+
<if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
and fol.operate_type regexp #{finishedOperateLog.operateType}
</if>
@@ -588,6 +662,24 @@
</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>
+ <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>
@@ -617,11 +709,20 @@
status,
remarks,
money,
- area
+ area,
+ compute_area
)
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},#{getComputeArea}
+
)
</insert>
@@ -634,11 +735,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>
@@ -717,11 +819,64 @@
fol.reviewed,
fol.reviewed_time,
fol.type,
- fol.remarks
+ fol.remarks,
+ fol.area,
+ fol.money,
+ o.customer_name,
+ o.project,
+ od.price,
+ o.order_type,
+ p.thickness * fol.area as square_millimeter
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
- where date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) <= #{dates[1]} and fol.operate_type=#{type}
+ left join sd.`order` o on o.order_id=fol.order_id
+ left join sd.product p on p.id=od.product_id
+ where
+ date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) <= #{dates[1]}
+
+ and fol.operate_type=#{type}
+
+ </select>
+
+ <select id="exportFinishedOperateLogReportByDatetime">
+ 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.stater_operation_order_number,
+ fol.end_operation_order_number,
+ fol.operate_time,
+ fol.`status`,
+ fol.is_state,
+ fol.reviewed,
+ fol.reviewed_time,
+ fol.type,
+ fol.remarks,
+ fol.area,
+ fol.money,
+ o.customer_name,
+ o.project,
+ od.price,
+ o.order_type,
+ p.thickness * fol.area as square_millimeter
+ 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
+ left join sd.product p on p.id=od.product_id
+ where
+ fol.operate_time>=#{dates[0]} and fol.operate_time <= #{dates[1]}
+
+ and fol.operate_type=#{type}
</select>
@@ -734,16 +889,21 @@
operator,
quantity,
operate_time,
- status
+ status,
+ area,
+ compute_area,
+ remarks,
+ money
)
values (
- #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"鍏ュ簱",#{userName},#{orderDetail.quantity},now(),"鏈鏍�"
+ #{oddNumber} ,#{orderDetail.orderId},#{processId},#{orderDetail.orderNumber},"鍏ュ簱",#{userName},#{orderDetail.quantity},now(),"鏈鏍�",
+ #{orderDetail.computeGrossArea},#{orderDetail.computeArea},"",#{orderDetail.grossAmount}
)
</insert>
- <delete id="updateOrderFinishedOperateLog" >
+ <update id="updateOrderFinishedOperateLog" >
update mm.finished_operate_log set status="宸蹭綔搴�" where order_id=#{orderDetail.orderId} and operation_number=#{orderDetail.orderNumber} and operate_type="鍏ュ簱";
- </delete>
+ </update>
<select id="getSelectStorageRecordPint" resultMap="selectFinishedGoodsInventory">
select fol.id,
@@ -760,6 +920,7 @@
od.height,
o.project,
o.customer_name,
+ o.customer_Id,
o.delivery_address,
fol.operate_time,
fol.`status`,
@@ -890,7 +1051,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,
@@ -943,7 +1105,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
@@ -1003,4 +1166,8 @@
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