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

fix：订单版本号变更bug修复

dev_1.0.2
UNISINSIGHT\rdpnr_jiangpeng 2026-04-01 14:06:23 +08:00
parent e9c73d1925
commit 60a9bdab2e
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-sip/src/main/java/com/ruoyi/sip/controller/InventoryDeliveryController.java
View File

@ -171,7 +171,7 @@ public class InventoryDeliveryController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult remove(Long id) public AjaxResult remove(Long id)
{ {
return toAjax(inventoryDeliveryService.deleteInventoryOuterById(id, true)); return toAjax(inventoryDeliveryService.deleteInventoryOuterById(id, true, null));
} }
@Log(title = "发货记录", businessType = BusinessType.DELETE) @Log(title = "发货记录", businessType = BusinessType.DELETE)
@PostMapping( "/recall") @PostMapping( "/recall")

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

@ -64,7 +64,7 @@ public interface IInventoryDeliveryService
void statusUpdate(InventoryDelivery inventoryDelivery); void statusUpdate(InventoryDelivery inventoryDelivery);
int deleteInventoryOuterById(Long id, boolean realDeleted); int deleteInventoryOuterById(Long id, boolean realDeleted, String orderCode);
List<DeliveryInfoVo> getNumberInfo(ApiDataQueryDto dto); List<DeliveryInfoVo> getNumberInfo(ApiDataQueryDto dto);

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

@ -287,7 +287,6 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService {
//累计发货 //累计发货
List<InventoryDelivery> inventoryDeliveries = deliveryMapper.selectQuantityByOrderCodeStatus(projectOrderInfo.getOrderCode(), InventoryDelivery.DeliveryStatusEnum.CONFIRM_DELIVERY.getCode()); List<InventoryDelivery> inventoryDeliveries = deliveryMapper.selectQuantityByOrderCodeStatus(projectOrderInfo.getOrderCode(), InventoryDelivery.DeliveryStatusEnum.CONFIRM_DELIVERY.getCode());
if (CollUtil.isNotEmpty(inventoryDeliveries)) { if (CollUtil.isNotEmpty(inventoryDeliveries)) {
// deliveryMapper.deleteInventoryDeliveryByIds(inventoryOuters.stream().map(item -> item.getId().toString()).toArray(String[]::new));
for (InventoryDelivery inventoryDeliverie : inventoryDeliveries) { for (InventoryDelivery inventoryDeliverie : inventoryDeliveries) {
InventoryDelivery updateDelivery = new InventoryDelivery(); InventoryDelivery updateDelivery = new InventoryDelivery();
updateDelivery.setId(inventoryDeliverie.getId()); updateDelivery.setId(inventoryDeliverie.getId());

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

@ -320,7 +320,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
} }
@Override @Override
public int deleteInventoryOuterById(Long id, boolean realDelete) { public int deleteInventoryOuterById(Long id, boolean realDelete, String orderCode) {
InventoryDelivery inventoryDelivery = inventoryDeliveryMapper.selectInventoryDeliveryById(id); InventoryDelivery inventoryDelivery = inventoryDeliveryMapper.selectInventoryDeliveryById(id);
//还原库存信息 //还原库存信息
InventoryInfo inventoryInfo = new InventoryInfo(); InventoryInfo inventoryInfo = new InventoryInfo();
@ -336,11 +336,18 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
return inventoryDeliveryMapper.deleteInventoryDeliveryById(id); return inventoryDeliveryMapper.deleteInventoryDeliveryById(id);
} else { } else {
// 2026-03-19：新逻辑，仅修改发货单状态为撤回，不删除库存表 // 2026-03-19：新逻辑，仅修改发货单状态为撤回，不删除库存表
inventoryDelivery = new InventoryDelivery(); int rows = 0;
inventoryDelivery.setId(id); List<InventoryDelivery> inventoryDeliveries = inventoryDeliveryMapper.selectQuantityByOrderCodeStatus(orderCode, InventoryDelivery.DeliveryStatusEnum.CONFIRM_DELIVERY.getCode());
inventoryDelivery.setDeliveryStatus(InventoryDelivery.DeliveryStatusEnum.RECALL_DELIVERY.getCode()); if (CollUtil.isNotEmpty(inventoryDeliveries)) {
inventoryDelivery.setUpdateTime(DateUtils.getNowDate()); for (InventoryDelivery inventoryDeliverie : inventoryDeliveries) {
return inventoryDeliveryMapper.updateInventoryDelivery(inventoryDelivery); InventoryDelivery updateDelivery = new InventoryDelivery();
updateDelivery.setId(inventoryDeliverie.getId());
updateDelivery.setDeliveryStatus(InventoryDelivery.DeliveryStatusEnum.RECALL_DELIVERY.getCode());
updateDelivery.setUpdateTime(DateUtils.getNowDate());
rows += inventoryDeliveryMapper.updateInventoryDelivery(updateDelivery);
}
}
return rows;
} }
} }
@ -381,7 +388,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
InventoryDelivery inventoryDelivery = inventoryDeliveryMapper.selectInventoryDeliveryById(id); InventoryDelivery inventoryDelivery = inventoryDeliveryMapper.selectInventoryDeliveryById(id);
ProjectOrderInfo projectOrderInfo = projectOrderInfoService.selectProjectOrderInfoByOrderCode(inventoryDelivery.getOrderCode()); ProjectOrderInfo projectOrderInfo = projectOrderInfoService.selectProjectOrderInfoByOrderCode(inventoryDelivery.getOrderCode());
deleteInventoryOuterById(id, false); deleteInventoryOuterById(id, false, projectOrderInfo.getOrderCode());
List<ProjectProductInfo> projectProductInfos = projectProductInfoService.listDeliveryProductByOrderCode(Collections.singletonList(inventoryDelivery.getOrderCode())); List<ProjectProductInfo> projectProductInfos = projectProductInfoService.listDeliveryProductByOrderCode(Collections.singletonList(inventoryDelivery.getOrderCode()));
//软硬件之和 //软硬件之和
long sum = projectProductInfos.stream().mapToLong(ProjectProductInfo::getQuantity).sum(); long sum = projectProductInfos.stream().mapToLong(ProjectProductInfo::getQuantity).sum();