fix:发货单撤回bug修复
parent
baae63153a
commit
9e8edf01b8
|
|
@ -379,6 +379,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
|
||||||
throw new ServiceException("存在已完成或审批中的应收、应付信息,无法执行撤回操作");
|
throw new ServiceException("存在已完成或审批中的应收、应付信息,无法执行撤回操作");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ProjectOrderInfo projectOrderInfo = projectOrderInfoService.selectProjectOrderInfoById(id);
|
||||||
InventoryDelivery inventoryDelivery = inventoryDeliveryMapper.selectInventoryDeliveryById(id);
|
InventoryDelivery inventoryDelivery = inventoryDeliveryMapper.selectInventoryDeliveryById(id);
|
||||||
deleteInventoryOuterById(id, false);
|
deleteInventoryOuterById(id, false);
|
||||||
List<ProjectProductInfo> projectProductInfos = projectProductInfoService.listDeliveryProductByOrderCode(Collections.singletonList(inventoryDelivery.getOrderCode()));
|
List<ProjectProductInfo> projectProductInfos = projectProductInfoService.listDeliveryProductByOrderCode(Collections.singletonList(inventoryDelivery.getOrderCode()));
|
||||||
|
|
@ -405,11 +406,10 @@ 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.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());
|
||||||
updateOrder.setOperationVersion(updateOrder.getOperationVersion() + 1);
|
updateOrder.setOperationVersion(projectOrderInfo.getOperationVersion() + 1);
|
||||||
projectOrderInfoService.updateProjectOrderInfoByCode(updateOrder);
|
projectOrderInfoService.updateProjectOrderInfoByCode(updateOrder);
|
||||||
//修改累计发货数量
|
//修改累计发货数量
|
||||||
productInfoService.updateCumulativeCount(-inventoryDelivery.getQuantity(), inventoryDelivery.getProductCode());
|
productInfoService.updateCumulativeCount(-inventoryDelivery.getQuantity(), inventoryDelivery.getProductCode());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue