From 9e8edf01b8abe4691344a30879709efd159f608c Mon Sep 17 00:00:00 2001 From: "UNISINSIGHT\\rdpnr_jiangpeng" Date: Mon, 30 Mar 2026 15:37:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8F=91=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E6=92=A4=E5=9B=9Ebug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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());