From 69a25cd577d5639f2869bcf80f498b373e80137e Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期三, 17 十二月 2025 10:43:44 +0800
Subject: [PATCH] 修改旋转逻辑，增加辅助旋转功能
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 13 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 4b0a927..20752c8 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"/>
@@ -36,6 +37,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>
@@ -63,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}
@@ -134,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}
@@ -211,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">
@@ -220,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">
@@ -483,11 +509,14 @@
fol.money,
o.customer_name,
o.project,
- od.price
+ 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="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
@@ -552,6 +581,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
@@ -565,6 +597,7 @@
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="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
@@ -629,6 +662,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>
@@ -658,7 +694,8 @@
status,
remarks,
money,
- area
+ area,
+ compute_area
)
values (
#{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},
@@ -669,7 +706,7 @@
<if test="createTime == null">
now()
</if>
- ,"鏈鏍�",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
+ ,"鏈鏍�",#{container},#{deliveryDetailMoney},#{deliveryDetailArea},#{getComputeArea}
)
</insert>
@@ -772,11 +809,14 @@
fol.money,
o.customer_name,
o.project,
- od.price
+ 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)>=#{dates[0]} and date(fol.operate_time) <= #{dates[1]} and fol.operate_type=#{type}
</select>
@@ -790,16 +830,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,
@@ -947,7 +992,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,
@@ -1000,7 +1046,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
@@ -1060,4 +1107,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