diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java index ec562bc2..4f33faf8 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java @@ -379,6 +379,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { throw new ServiceException("存在已完成或审批中的应收、应付信息,无法执行撤回操作"); } + ProjectOrderInfo projectOrderInfo = projectOrderInfoService.selectProjectOrderInfoById(id); InventoryDelivery inventoryDelivery = inventoryDeliveryMapper.selectInventoryDeliveryById(id); deleteInventoryOuterById(id, false); List projectProductInfos = projectProductInfoService.listDeliveryProductByOrderCode(Collections.singletonList(inventoryDelivery.getOrderCode())); @@ -405,11 +406,10 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { //修改订单的发货状态 ProjectOrderInfo updateOrder = new ProjectOrderInfo(); updateOrder.setOrderCode(inventoryDelivery.getOrderCode()); -// updateOrder.setVersionCode("add"); updateOrder.setUpdateTime(new Date()); updateOrder.setUpdateBy(ShiroUtils.getUserId().toString()); updateOrder.setDeliveryStatus(sum == allSum ? ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode() : ProjectOrderInfo.DeliveryStatusEnum.PART_DELIVERY.getCode()); - updateOrder.setOperationVersion(updateOrder.getOperationVersion() + 1); + updateOrder.setOperationVersion(projectOrderInfo.getOperationVersion() + 1); projectOrderInfoService.updateProjectOrderInfoByCode(updateOrder); //修改累计发货数量 productInfoService.updateCumulativeCount(-inventoryDelivery.getQuantity(), inventoryDelivery.getProductCode());