diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 39f30a004..1349a37b6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -279,7 +279,7 @@ public class DistributionDeliveryListEntity extends TenantEntity { /** * 签收件数 */ - @ApiModelProperty(value = "客户名称") + @ApiModelProperty(value = "签收数量") @TableField(exist = false) private Integer signingNumber; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientLogServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientLogServiceImpl.java index a1471df8b..d00ec454a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientLogServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientLogServiceImpl.java @@ -37,10 +37,6 @@ import java.util.List; public class BasicdataClientLogServiceImpl extends BaseServiceImpl implements IBasicdataClientLogService { - @PostConstruct - public void intt(){ - log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>11111111"); - } @Override diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index ae925fe2c..3b3bcb1cf 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -171,6 +171,15 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>>>>>>记录客户修改日志操作失败"); } + if (Objects.isNull(basicdataClient.getBladeRegionProvinceId())){ + basicdataClient.setBladeRegionProvinceId(""); + } + if (Objects.isNull(basicdataClient.getBladeRegionAreaId())){ + basicdataClient.setBladeRegionAreaId(""); + } + if (Objects.isNull(basicdataClient.getBladeRegionCityId())){ + basicdataClient.setBladeRegionCityId(""); + } //修改 this.updateById(basicdataClient); List list = basicdataStoreBusinessService.list(Wrappers.query().lambda() diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 4e1934e55..c95bdbc1c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -71,7 +71,7 @@ import java.util.Objects; */ @RestController @AllArgsConstructor -@RequestMapping("/deliveryList") +@RequestMapping(value = "/deliveryList",produces = "application/json; charset=UTF-8") @Api(value = "配送管理", tags = "配送管理接口") @Slf4j public class DistributionDeliveryListController extends BladeController { @@ -252,7 +252,7 @@ public class DistributionDeliveryListController extends BladeController { @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入distributionDeliveryList") - public R> page(DistributionDeliveryListDTO distributionDeliveryList, Query query) { + public R> page( DistributionDeliveryListDTO distributionDeliveryList, Query query) { IPage pages = distributionDeliveryListService.selectDistributionDeliveryListPage(Condition.getPage(query), distributionDeliveryList); return R.data(DistributionDeliveryListWrapper.build().pageVO(pages)); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java index 298762fc1..7404ad40d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java @@ -99,4 +99,11 @@ public class DistributionDeliveryAllocationDTO { private Integer isAll; + /** + * 是否整车 + */ + @ApiModelProperty(value = "是否整车") + private Integer isAll; + + }