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());