diff --git a/blade-service/logpm-factory/src/main/resources/application.yml b/blade-service/logpm-factory/src/main/resources/application.yml index e5d26d37f..245dc4cfd 100644 --- a/blade-service/logpm-factory/src/main/resources/application.yml +++ b/blade-service/logpm-factory/src/main/resources/application.yml @@ -46,5 +46,5 @@ xxl: ip: 127.0.0.1 logpath: ../data/applogs/logpm-factory-xxljob/jobhandler logretentiondays: -1 - port: 7019 + port: 7018 diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index d3aa88a18..f9a47956d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -246,10 +246,10 @@ public class CarsLoadController { return R.fail(400,"仓库信息为空"); } loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(Objects.isNull(loadId)){ - log.warn(method+"配载id为空 loadId={}",loadId); - return R.fail(400,"配载id为空"); - } +// if(Objects.isNull(loadId)){ +// log.warn(method+"配载id为空 loadId={}",loadId); +// return R.fail(400,"配载id为空"); +// } return carsLoadService.findAllOrderList(loadCarsDTO); }catch (CustomerException e){