diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index c3bbd3312..eb9e7992d 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -61,6 +61,7 @@ public class LoadCarsDTO implements Serializable { private List zeroList = new ArrayList<>(); private Long carsLoadScanId; + private String carsLoadScanIds; private String arriveDateStr; diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java index 53851d7fc..263ac461f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java @@ -250,7 +250,7 @@ public class CarsLoadApiController { public R removeCarsLoadScan(@RequestBody LoadCarsDTO loadCarsDTO) { String method = "############removeCarsLoadScan: "; log.info(method + "请求参数{}", loadCarsDTO); - Long carsLoadScanId = loadCarsDTO.getCarsLoadScanId(); + String carsLoadScanIds = loadCarsDTO.getCarsLoadScanIds(); try{ //当前登录人选择的仓库 @@ -261,12 +261,12 @@ public class CarsLoadApiController { } loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(Objects.isNull(carsLoadScanId)){ - log.warn(method+"配载装车扫描id为空 carsLoadScanId={}",carsLoadScanId); + if(StringUtil.isBlank(carsLoadScanIds)){ + log.warn(method+"配载装车扫描id为空 carsLoadScanIds={}",carsLoadScanIds); return R.fail(405,"配载装车扫描id为空"); } - return carsLoadService.removeCarsLoadScan(carsLoadScanId,myCurrentWarehouse.getId()); + return carsLoadService.removeCarsLoadScan(carsLoadScanIds,myCurrentWarehouse.getId()); }catch (CustomerException e){ log.error(e.message,e); return R.fail(e.code,e.message); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index d2b5fb181..cc9f36e06 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -86,7 +86,7 @@ public interface ITrunklineCarsLoadService extends BaseService