diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/LoadingManageController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/LoadingManageController.java index 5e8dc1d..939ac35 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/LoadingManageController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/LoadingManageController.java @@ -104,22 +104,29 @@ public class LoadingManageController extends BladeController { return R.status(loadingManageService.reassign(loadingManage)); } - @PostMapping("/cancel") + @PostMapping("/change-route") @ApiOperationSupport(order = 9) + @Operation(summary = "变更运输路线", description = "传入配载单路线与变更记录") + public R changeRoute(@RequestBody LoadingManage loadingManage) { + return R.status(loadingManageService.changeRoute(loadingManage)); + } + + @PostMapping("/cancel") + @ApiOperationSupport(order = 10) @Operation(summary = "取消", description = "传入id") public R cancel(@Parameter(description = "主键", required = true) @RequestParam Long id) { return R.status(loadingManageService.cancel(id)); } @PostMapping("/complete") - @ApiOperationSupport(order = 10) + @ApiOperationSupport(order = 11) @Operation(summary = "完成", description = "传入id") public R complete(@Parameter(description = "主键", required = true) @RequestParam Long id) { return R.status(loadingManageService.complete(id)); } @PostMapping("/batch-complete") - @ApiOperationSupport(order = 11) + @ApiOperationSupport(order = 12) @Operation(summary = "批量完成", description = "传入ids") public R batchComplete(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { return R.data(loadingManageService.batchComplete(ids)); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ILoadingManageService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ILoadingManageService.java index e6ac98c..43bfaa4 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ILoadingManageService.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ILoadingManageService.java @@ -36,6 +36,8 @@ public interface ILoadingManageService extends BaseService { boolean reassign(LoadingManage loadingManage); + boolean changeRoute(LoadingManage loadingManage); + boolean cancel(Long id); boolean complete(Long id); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java index 6ca498d..ed6da30 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java @@ -77,8 +77,10 @@ public class LoadingManageServiceImpl extends BaseServiceImpl oldWaybillIds = new ArrayList<>(); if (Func.isNotEmpty(loadingManage.getId())) { LoadingManage oldRecord = loadEditable(loadingManage.getId(), true); + oldWaybillIds = waybillIds(oldRecord.getWaybillIdsJson()); loadingManage.setLoadingNo(oldRecord.getLoadingNo()); loadingManage.setDeptId(oldRecord.getDeptId()); loadingManage.setDeptName(oldRecord.getDeptName()); @@ -88,7 +90,10 @@ public class LoadingManageServiceImpl extends BaseServiceImpl deleteIdList = new ArrayList<>(); + List releaseWaybillIds = new ArrayList<>(); for (LoadingManage loadingManage : listByIds(idList)) { TransportBusinessSupport.assertCurrentDept(loadingManage.getDeptId(), "配载管理"); if (!Objects.equals(loadingManage.getBusinessStatus(), STATUS_DRAFT)) { @@ -132,9 +138,11 @@ public class LoadingManageServiceImpl extends BaseServiceImpl