From 52839e343c99e752c49fe475fd2b89fc83f45ced Mon Sep 17 00:00:00 2001 From: chenhao Date: Tue, 18 Nov 2025 15:37:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E5=B9=B6=E9=9B=86=E6=88=90=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E6=9C=8D=E5=8A=A1-=20=E5=BC=95=E5=85=A5TodoService?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=93=8D=E4=BD=9C=20-=20=E5=9C=A8=E6=92=A4=E5=8D=95?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7=E5=B9=B6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E4=B8=BA?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=8B=92=E7=BB=9D=20-=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=8E=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E7=9A=84=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9=20-=20=E6=B3=A8=E9=87=8A=E6=8E=89?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=97=B6=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java | 8 +++++++- .../sip/service/impl/InventoryDeliveryServiceImpl.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) 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 a1e5ed08..f9021ee7 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 @@ -6,6 +6,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.sip.domain.*; import com.ruoyi.sip.dto.inventory.ProductDetail; import com.ruoyi.sip.dto.inventory.ProductWarehouseInfo; +import com.ruoyi.sip.flowable.service.TodoService; import com.ruoyi.sip.mapper.InventoryDeliveryMapper; import com.ruoyi.sip.mapper.ProjectOrderInfoMapper; import com.ruoyi.sip.service.*; @@ -50,6 +51,8 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService { private IInventoryAuthService inventoryAuthService; @Autowired private InventoryDeliveryMapper deliveryMapper; + @Autowired + private TodoService todoService; @Override public ExecutionOrderVo selectInfo(Long id) { @@ -240,9 +243,12 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService { updateOrder.setOuterStatus(ProjectOrderInfo.OuterStatusEnum.NOT_OUTER.getCode()); updateOrder.setDeliveryStatus(ProjectOrderInfo.DeliveryStatusEnum.NOT_DELIVERY.getCode()); updateOrder.setSignStatus(ProjectOrderInfo.SignStatusEnum.NOT_SIGN.getCode()); - //todo 撤单是否需要重新审批 + updateOrder.setVersionCode(String.valueOf(Integer.parseInt(projectOrderInfo.getVersionCode())+1)); + updateOrder.setOrderStatus(ProjectOrderInfo.OrderStatus.APPROVE_REJECT.getCode()); updateOrder.setId(id); projectOrderInfoMapper.updateProjectOrderInfo(updateOrder); + //剔除流程 + todoService.deleteTodoByBusinessKey(projectOrderInfo.getOrderCode()); //修改库存 InventoryOuter inventoryOuter = new InventoryOuter(); inventoryOuter.setOrderCode(projectOrderInfo.getOrderCode()); 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 8ca70a0c..471dd395 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 @@ -289,7 +289,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { //修改订单的发货状态 ProjectOrderInfo updateOrder = new ProjectOrderInfo(); updateOrder.setOrderCode(inventoryDelivery.getOrderCode()); - updateOrder.setVersionCode("add"); +// 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());