diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java index 5739f72c..bc006f78 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java @@ -275,14 +275,6 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService { projectOrderInfoRecallService.insertProjectOrderInfoRecall(projectOrderInfoRecall); //剔除流程 todoService.deleteTodoByBusinessKey(projectOrderInfo.getOrderCode()); - //修改库存 - InventoryOuter inventoryOuter = new InventoryOuter(); - inventoryOuter.setOrderCode(projectOrderInfo.getOrderCode()); - List inventoryOuters = outerService.selectInventoryOuterList(inventoryOuter); - if (CollUtil.isNotEmpty(inventoryOuters)) { - outerService.deleteInventoryOuterByIds(inventoryOuters.stream().map(item -> item.getId().toString()).collect(Collectors.joining(","))); - } - Map outerSumMap = inventoryOuters.stream().collect(Collectors.toMap(InventoryOuter::getProductCode, InventoryOuter::getQuantity, Long::sum)); //累计发货 List inventoryDeliveries = deliveryMapper.selectQuantityByOrderCodeStatus(projectOrderInfo.getOrderCode(), InventoryDelivery.DeliveryStatusEnum.CONFIRM_DELIVERY.getCode()); @@ -295,6 +287,15 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService { deliveryMapper.updateInventoryDelivery(updateDelivery); } } + //修改库存 + InventoryOuter inventoryOuter = new InventoryOuter(); + inventoryOuter.setOrderCode(projectOrderInfo.getOrderCode()); + List inventoryOuters = outerService.selectInventoryOuterList(inventoryOuter); + if (CollUtil.isNotEmpty(inventoryOuters)) { + outerService.deleteInventoryOuterByIds(inventoryOuters.stream().map(item -> item.getId().toString()).collect(Collectors.joining(","))); + } + Map outerSumMap = inventoryOuters.stream().collect(Collectors.toMap(InventoryOuter::getProductCode, InventoryOuter::getQuantity, Long::sum)); + Map deliveryMap = inventoryDeliveries.stream().collect(Collectors.toMap(InventoryDelivery::getProductCode, InventoryDelivery::getQuantity, Long::sum)); Map updateMap = new HashMap<>(); for (Map.Entry entry : outerSumMap.entrySet()) {