From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 113 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 41 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
index e5bd801..415f92a 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -24,6 +24,8 @@
<result column="end_time" property="endTime"/>
<result column="box_no" property="boxNo"/>
<result column="weight" property="weight"/>
+ <result column="compute_area" property="computeArea"/>
+ <result column="compute_gross_area" property="computeGrossArea"/>
<result column="order_id" property="order.orderId"/>
<result column="project" property="order.project"/>
@@ -89,6 +91,7 @@
<result column="delivery_id" property="deliveryDetail.deliveryId"/>
<result column="delivery_number" property="deliveryDetail.deliveryNumber"/>
<result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
+ <result column="delivery_detail_state" property="deliveryDetail.deliveryDetailState"/>
<result column="order_id" property="deliveryDetail.orderId"/>
<result column="create_time" property="deliveryDetail.createTime"/>
<result column="dd_quantity" property="deliveryDetail.quantity"/>
@@ -129,27 +132,27 @@
<update id="updateInventoryquantityAllocateInt">
update mm.finished_goods_inventory
set inventory=inventory+#{quantity},quantity_available=quantity_available+#{quantity},
- update_time=now(),area=actual_signal_area*quantity_available
+ update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
where order_number=#{orderNumber} and order_id=#{orderId}
</update>
<update id="updateInventoryquantityAllocateOut">
update mm.finished_goods_inventory
set inventory=inventory-#{quantity},quantity_available=quantity_available-#{quantity},
- update_time=now(),area=actual_signal_area*quantity_available
+ update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
where order_number=#{orderNumber} and order_id=#{orderId}
</update>
<update id="updateInventoryquantityInt">
update mm.finished_goods_inventory
set quantity_available=quantity_available+#{quantity},
- update_time=now(),area=actual_signal_area*quantity_available
+ update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
where order_number=#{orderNumber} and order_id=#{orderId}
</update>
<update id="updateInventoryquantityIntBybox">
update mm.finished_goods_inventory
set quantity_available=quantity_available+#{quantity},
- update_time=now(),area=actual_signal_area*quantity_available
+ update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
where order_number=#{orderNumber} and order_id=#{orderId}
<if test="boxNo != null ">
and trim(box_no) = trim(#{boxNo})
@@ -162,7 +165,7 @@
<update id="updateInventoryquantityOut">
update mm.finished_goods_inventory
set quantity_available=quantity_available-#{quantity},
- update_time=now(),area=actual_signal_area*quantity_available
+ update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
where order_id=#{orderId} and order_number=#{orderNumber}
<if test="boxNo != null ">
and trim(box_no) = trim(#{boxNo})
@@ -330,7 +333,7 @@
<update id="updateInventoryquantityavailable">
update mm.finished_goods_inventory
set inventory=0,quantity_available=0,
- update_time=now(),area=0,status=1
+ update_time=now(),area=0,status=1,compute_gross_area=0
where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId}
</update>
@@ -559,7 +562,7 @@
<update id="updateInventory">
update mm.finished_goods_inventory
set inventory=inventory+${flowCard.inventoryQuantity},quantity_available=quantity_available+${flowCard.inventoryQuantity},
- update_time=now(),area=actual_signal_area*quantity_available
+ update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
<if test="storageRegion != null and storageRegion != ''">
, storage_region= #{storageRegion}
</if>
@@ -582,7 +585,7 @@
<update id="updateInventoryOut">
update mm.finished_goods_inventory
set inventory=inventory-${finishedOperateLog.quantity},quantity_available=quantity_available-${finishedOperateLog.quantity},
- update_time=now(),area=actual_signal_area*quantity_available
+ update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
where order_number=#{finishedOperateLog.operationNumber} and order_id=#{finishedOperateLog.orderId}
<if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
and box_no=#{finishedOperateLog.remarks}
@@ -607,13 +610,16 @@
box_no,
update_time,
end_time,
- remark
+ remark,
+ compute_area,
+ compute_gross_area
+
)
values (
#{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.processId},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),
ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}*#{flowCard.inventoryQuantity}/1000000,2),
#{flowCard.inventoryQuantity},null,#{storageRegion},
- 0,now(),#{container},now(),null,#{remark}
+ 0,now(),#{container},now(),null,#{remark},#{getComputeArea},#{getComputeArea}*#{flowCard.inventoryQuantity}
)
</insert>
@@ -865,6 +871,8 @@
fgi.end_time,
fgi.remark,
fgi.box_no,
+ fgi.compute_area,
+ fgi.compute_gross_area,
round(fgi.area*p.total_thickness*2.5/1000,5) as weight
from finished_goods_inventory fgi
left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
@@ -873,81 +881,87 @@
<where>
and fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
<if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
- and od.width like #{finishedGoodsInventory.orderDetail.width}
+ and od.width regexp #{finishedGoodsInventory.orderDetail.width}
</if>
<if test="finishedGoodsInventory.orderDetail.orderNumber != null and finishedGoodsInventory.orderDetail.orderNumber != ''">
- and od.order_number like #{finishedGoodsInventory.orderDetail.orderNumber}
+ and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
</if>
<if test="finishedGoodsInventory.orderDetail.productName != null and finishedGoodsInventory.orderDetail.productName != ''">
- and od.product_name like #{finishedGoodsInventory.orderDetail.productName}
+ and od.product_name regexp #{finishedGoodsInventory.orderDetail.productName}
</if>
<if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">
- and od.product_id like #{finishedGoodsInventory.orderDetail.productId}
+ and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}
</if>
<if test="finishedGoodsInventory.orderDetail.buildingNumber != null and finishedGoodsInventory.orderDetail.buildingNumber != ''">
- and od.building_number like #{finishedGoodsInventory.orderDetail.buildingNumber}
+ and od.building_number regexp #{finishedGoodsInventory.orderDetail.buildingNumber}
</if>
<if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
- and o.order_id like #{finishedGoodsInventory.order.orderId}
+ and o.order_id regexp #{finishedGoodsInventory.order.orderId}
</if>
<if test="finishedGoodsInventory.order.project != null and finishedGoodsInventory.order.project != ''">
- and o.project like #{finishedGoodsInventory.order.project}
+ and o.project regexp #{finishedGoodsInventory.order.project}
</if>
<if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">
- and o.order_type like #{finishedGoodsInventory.order.orderType}
+ and o.order_type regexp #{finishedGoodsInventory.order.orderType}
</if>
<if test="finishedGoodsInventory.order.customerId != null and finishedGoodsInventory.order.customerId != ''">
- and o.customer_id like #{finishedGoodsInventory.order.customerId}
+ and o.customer_id regexp #{finishedGoodsInventory.order.customerId}
</if>
<if test="finishedGoodsInventory.order.customerName != null and finishedGoodsInventory.order.customerName != ''">
- and o.customer_name like #{finishedGoodsInventory.order.customerName}
+ and o.customer_name regexp #{finishedGoodsInventory.order.customerName}
</if>
<if test="finishedGoodsInventory.order.batch != null and finishedGoodsInventory.order.batch != ''">
- and o.batch like #{finishedGoodsInventory.order.batch}
+ and o.batch regexp #{finishedGoodsInventory.order.batch}
</if>
<if test="finishedGoodsInventory.order.salesman != null and finishedGoodsInventory.order.salesman != ''">
- and o.salesman like #{finishedGoodsInventory.order.salesman}
+ and o.salesman regexp #{finishedGoodsInventory.order.salesman}
</if>
<if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
- and od.height like REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
+ and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
- and fgi.inventory like #{finishedGoodsInventory.inventory}
+ and fgi.inventory regexp #{finishedGoodsInventory.inventory}
</if>
<if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available like #{finishedGoodsInventory.quantityAvailable}
+ and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
</if>
<if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area like REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
+ and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
+ </if>
+ <if test="finishedGoodsInventory.computeArea != null and finishedGoodsInventory.computeArea != ''">
+ and fgi.compute_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')
+ </if>
+ <if test="finishedGoodsInventory.computeGrossArea != null and finishedGoodsInventory.computeGrossArea != ''">
+ and fgi.compute_gross_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
- and fgi.area like REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
+ and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
- and fgi.warehouse_number like #{finishedGoodsInventory.warehouseNumber}
+ and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
</if>
<if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region like #{finishedGoodsInventory.storageRegion}
+ and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
</if>
<if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
- and fgi.`status` like #{finishedGoodsInventory.status}
+ and fgi.`status` regexp #{finishedGoodsInventory.status}
</if>
<if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
- and fgi.enter_storage_time like #{finishedGoodsInventory.enterStorageTime}
+ and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
</if>
<if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
- and fgi.update_time like #{finishedGoodsInventory.updateTime}
+ and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
</if>
<if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
- and fgi.end_time like #{finishedGoodsInventory.endTime}
+ and fgi.end_time regexp #{finishedGoodsInventory.endTime}
</if>
<if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
- and fgi.remark like #{finishedGoodsInventory.remark}
+ and fgi.remark regexp #{finishedGoodsInventory.remark}
</if>
<if test="finishedGoodsInventory.boxNo != null and finishedGoodsInventory.boxNo != ''">
- and fgi.box_no like #{finishedGoodsInventory.boxNo}
+ and fgi.box_no regexp #{finishedGoodsInventory.boxNo}
</if>
</where>
@@ -1022,6 +1036,12 @@
<if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
</if>
+ <if test="finishedGoodsInventory.computeArea != null and finishedGoodsInventory.computeArea != ''">
+ and fgi.compute_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')
+ </if>
+ <if test="finishedGoodsInventory.computeGrossArea != null and finishedGoodsInventory.computeGrossArea != ''">
+ and fgi.compute_gross_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')
+ </if>
<if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
</if>
@@ -1072,20 +1092,24 @@
enter_storage_time,
update_time,
end_time,
- remark
+ remark,
+ compute_area,
+ compute_gross_area
+
)
values (
- #{orderDetail.orderId} ,#{orderDetail.orderNumber},"",#{orderDetail.quantity},#{orderDetail.computeArea},
- #{orderDetail.computeGrossArea},
+ #{orderDetail.orderId} ,#{orderDetail.orderNumber},"",#{orderDetail.quantity},#{orderDetail.area},
+ #{orderDetail.grossArea},
#{orderDetail.quantity},null,"",
- 0,now(),now(),null,""
+ 0,now(),now(),null,"",#{orderDetail.computeArea},
+ #{orderDetail.computeGrossArea}
)
</insert>
<update id="updateOrderInventory">
update mm.finished_goods_inventory
set inventory=${orderDetail.quantity},quantity_available=${orderDetail.quantity},
- update_time=now(),area=actual_signal_area*quantity_available
+ update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available
where order_number=#{orderDetail.orderNumber} and order_id=#{orderDetail.orderId}
</update>
@@ -1125,6 +1149,7 @@
od.building_number,
d.creator,
dd.delivery_detail_remakes,
+ dd.delivery_detail_state,
dd.create_time,
dd.box_no
from sd.delivery_detail dd
@@ -1200,7 +1225,7 @@
sum(fol.quantity_available) as quantity,
od.product_name,
od.product_id,
- ROUND(sum(od.width * od.height * fol.quantity_available / 1000000) , 2 ) as area,
+ ROUND(sum(fol.compute_area * fol.quantity_available) , 2 ) as area,
ROUND(sum(od.width * od.height * fol.quantity_available / 1000000) , 2 )*#{thickness}*2.5 as weight
FROM
( SELECT * FROM mm.finished_goods_inventory aa
@@ -1219,4 +1244,10 @@
ORDER BY
od.order_number
</select>
+
+ <delete id="deleteFinishedGoodsInventoryDate" >
+ delete fgi from mm.finished_goods_inventory fgi left join sd.`order` o on o.order_id=fgi.order_id
+ where o.create_time < DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
+ and o.delivery=2 and fgi.inventory=0
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0