mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

dev_1.0.0
chenhao 2025-11-18 15:47:12 +08:00
parent 253cbdb5fb 52839e343c
commit b958e1f607
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.sip.domain.*; import com.ruoyi.sip.domain.*;
import com.ruoyi.sip.dto.inventory.ProductDetail; import com.ruoyi.sip.dto.inventory.ProductDetail;
import com.ruoyi.sip.dto.inventory.ProductWarehouseInfo; 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.InventoryDeliveryMapper;
import com.ruoyi.sip.mapper.ProjectOrderInfoMapper; import com.ruoyi.sip.mapper.ProjectOrderInfoMapper;
import com.ruoyi.sip.service.*; import com.ruoyi.sip.service.*;
@ -50,6 +51,8 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService {
private IInventoryAuthService inventoryAuthService; private IInventoryAuthService inventoryAuthService;
@Autowired @Autowired
private InventoryDeliveryMapper deliveryMapper; private InventoryDeliveryMapper deliveryMapper;
@Autowired
private TodoService todoService;
@Override @Override
public ExecutionOrderVo selectInfo(Long id) { public ExecutionOrderVo selectInfo(Long id) {
@ -240,9 +243,12 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService {
updateOrder.setOuterStatus(ProjectOrderInfo.OuterStatusEnum.NOT_OUTER.getCode()); updateOrder.setOuterStatus(ProjectOrderInfo.OuterStatusEnum.NOT_OUTER.getCode());
updateOrder.setDeliveryStatus(ProjectOrderInfo.DeliveryStatusEnum.NOT_DELIVERY.getCode()); updateOrder.setDeliveryStatus(ProjectOrderInfo.DeliveryStatusEnum.NOT_DELIVERY.getCode());
updateOrder.setSignStatus(ProjectOrderInfo.SignStatusEnum.NOT_SIGN.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); updateOrder.setId(id);
projectOrderInfoMapper.updateProjectOrderInfo(updateOrder); projectOrderInfoMapper.updateProjectOrderInfo(updateOrder);
//剔除流程
todoService.deleteTodoByBusinessKey(projectOrderInfo.getOrderCode());
//修改库存 //修改库存
InventoryOuter inventoryOuter = new InventoryOuter(); InventoryOuter inventoryOuter = new InventoryOuter();
inventoryOuter.setOrderCode(projectOrderInfo.getOrderCode()); inventoryOuter.setOrderCode(projectOrderInfo.getOrderCode());

2
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
View File

@ -289,7 +289,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
//修改订单的发货状态 //修改订单的发货状态
ProjectOrderInfo updateOrder = new ProjectOrderInfo(); ProjectOrderInfo updateOrder = new ProjectOrderInfo();
updateOrder.setOrderCode(inventoryDelivery.getOrderCode()); updateOrder.setOrderCode(inventoryDelivery.getOrderCode());
updateOrder.setVersionCode("add"); // updateOrder.setVersionCode("add");
updateOrder.setUpdateTime(new Date()); updateOrder.setUpdateTime(new Date());
updateOrder.setUpdateBy(ShiroUtils.getUserId().toString()); updateOrder.setUpdateBy(ShiroUtils.getUserId().toString());
updateOrder.setDeliveryStatus(sum == allSum ? ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode() : ProjectOrderInfo.DeliveryStatusEnum.PART_DELIVERY.getCode()); updateOrder.setDeliveryStatus(sum == allSum ? ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode() : ProjectOrderInfo.DeliveryStatusEnum.PART_DELIVERY.getCode());