Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

order version统计数量和状态修改错误修复

Browse Source
This commit is contained in:
gaoqr
2026-05-29 20:07:40 +08:00
parent a1b5c12d0a
commit ef49a43085
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInfoVersionControlServiceImpl.java
+5 -5
View File
@@ -49,8 +49,8 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr
public void updateOrderPlateNumAndArea(OrderDO orderDO, Boolean delete) { public void updateOrderPlateNumAndArea(OrderDO orderDO, Boolean delete) {
Long orderId = orderDO.getId(); Long orderId = orderDO.getId();
// 重新计算订单数量 // 重新计算订单数量
// 统计每个orders下的未排单面积，更新到orders中 // 统计每个orders下的板件数量和面积，更新到orders中
OrderPlateNumAndAreaDO orderPlateNumAndAreaDO = orderMapper.selectPlateNumAndArea(orderId, delete); OrderPlateNumAndAreaDO orderPlateNumAndAreaDO = orderMapper.selectPlateNumAndArea(orderId, !delete);
// 当前订单下排单的板件数量 // 当前订单下排单的板件数量
Integer num = orderPlateNumAndAreaDO.getNum(); Integer num = orderPlateNumAndAreaDO.getNum();
@@ -60,7 +60,7 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr
.eq(OrderDO::getId, orderId) .eq(OrderDO::getId, orderId)
.eq(OrderDO::getVersion, version) .eq(OrderDO::getVersion, version)
.setIfPresent(OrderDO::getStatus, num == 0 ? OrderStatusEnum.EMPTY.getStatus() : OrderStatusEnum.NEW_ORDER.getStatus()) .setIfPresent(OrderDO::getStatus, num == 0 ? OrderStatusEnum.EMPTY.getStatus() : OrderStatusEnum.NEW_ORDER.getStatus())
.set(OrderDO::getPlannedPlateArea, orderPlateNumAndAreaDO.getArea()) .set(OrderDO::getArea, orderPlateNumAndAreaDO.getArea())
.set(OrderDO::getPlannedPlateNum, num) .set(OrderDO::getPlannedPlateNum, num)
.set(OrderDO::getVersion, version + 1); .set(OrderDO::getVersion, version + 1);
int update = orderMapper.update(updateWrapper); int update = orderMapper.update(updateWrapper);
@@ -77,7 +77,7 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr
.collect(Collectors.toMap(OrderBodyDO::getId, Function.identity())); .collect(Collectors.toMap(OrderBodyDO::getId, Function.identity()));
// 统计删除涉及的柜体下的数量和面积、更新到order_body // 统计删除涉及的柜体下的数量和面积、更新到order_body
Map<Long, OrderBodyPlateNumDO> bodyStatMap = orderBodyMapper.selectPlateNumAndArea(orderBodyIds, delete) Map<Long, OrderBodyPlateNumDO> bodyStatMap = orderBodyMapper.selectPlateNumAndArea(orderBodyIds, !delete)
.stream() .stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
OrderBodyPlateNumDO::getOrderBodyId, OrderBodyPlateNumDO::getOrderBodyId,
@@ -114,7 +114,7 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr
// 统计删除涉及的order_goods下的数量和面积、更新到order_goods // 统计删除涉及的order_goods下的数量和面积、更新到order_goods
Map<Long, OrderGoodsPlateNumAndAreaDO> goodStatMap = Map<Long, OrderGoodsPlateNumAndAreaDO> goodStatMap =
goodsMapper.selectPlateNumAndArea(orderGoodsIds, delete) goodsMapper.selectPlateNumAndArea(orderGoodsIds, !delete)
.stream() .stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
OrderGoodsPlateNumAndAreaDO::getOrderGoodsId, OrderGoodsPlateNumAndAreaDO::getOrderGoodsId,
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
-1
View File
@@ -1035,7 +1035,6 @@
from orders o from orders o
join order_plate op on o.organ_id = op.organ_id and o.id = op.order_id join order_plate op on o.organ_id = op.organ_id and o.id = op.order_id
where o.id = #{orderId} where o.id = #{orderId}
and op.plan_id = 0
and op.deleted = #{delete} and op.deleted = #{delete}
and o.deleted = false and o.deleted = false
</select> </select>