diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInfoVersionControlServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInfoVersionControlServiceImpl.java index 4118a6101..8a279f397 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInfoVersionControlServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInfoVersionControlServiceImpl.java @@ -49,8 +49,8 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr public void updateOrderPlateNumAndArea(OrderDO orderDO, Boolean delete) { Long orderId = orderDO.getId(); // 重新计算订单数量 - // 统计每个orders下的未排单面积,更新到orders中 - OrderPlateNumAndAreaDO orderPlateNumAndAreaDO = orderMapper.selectPlateNumAndArea(orderId, delete); + // 统计每个orders下的板件数量和面积,更新到orders中 + OrderPlateNumAndAreaDO orderPlateNumAndAreaDO = orderMapper.selectPlateNumAndArea(orderId, !delete); // 当前订单下排单的板件数量 Integer num = orderPlateNumAndAreaDO.getNum(); @@ -60,7 +60,7 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr .eq(OrderDO::getId, orderId) .eq(OrderDO::getVersion, version) .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::getVersion, version + 1); int update = orderMapper.update(updateWrapper); @@ -77,7 +77,7 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr .collect(Collectors.toMap(OrderBodyDO::getId, Function.identity())); // 统计删除涉及的柜体下的数量和面积、更新到order_body - Map bodyStatMap = orderBodyMapper.selectPlateNumAndArea(orderBodyIds, delete) + Map bodyStatMap = orderBodyMapper.selectPlateNumAndArea(orderBodyIds, !delete) .stream() .collect(Collectors.toMap( OrderBodyPlateNumDO::getOrderBodyId, @@ -114,7 +114,7 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr // 统计删除涉及的order_goods下的数量和面积、更新到order_goods Map goodStatMap = - goodsMapper.selectPlateNumAndArea(orderGoodsIds, delete) + goodsMapper.selectPlateNumAndArea(orderGoodsIds, !delete) .stream() .collect(Collectors.toMap( OrderGoodsPlateNumAndAreaDO::getOrderGoodsId, diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index b861a59bb..159d3455c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml @@ -1035,7 +1035,6 @@ from orders o join order_plate op on o.organ_id = op.organ_id and o.id = op.order_id where o.id = #{orderId} - and op.plan_id = 0 and op.deleted = #{delete} and o.deleted = false