From 107c6455768371bf3d40cf11146e1ae11c2f0525 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 9 Oct 2024 15:28:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E9=80=81=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=95=B4=E8=BD=A6=E5=AD=97=E6=AE=B5=E3=80=81=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=9C=B0=E5=9D=80BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionDeliveryListEntity.java | 8 +++++++- .../service/impl/BasicdataClientLogServiceImpl.java | 4 ---- .../service/impl/BasicdataClientServiceImpl.java | 9 +++++++++ .../controller/DistributionDeliveryListController.java | 4 ++-- .../dto/DistributionDeliveryAllocationDTO.java | 7 +++++++ .../impl/DistributionDeliveryListServiceImpl.java | 5 ++--- .../service/impl/DistributionReservationServiceImpl.java | 2 ++ 7 files changed, 29 insertions(+), 10 deletions(-) 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 46c78495b..7cd1037de 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,10 +279,16 @@ public class DistributionDeliveryListEntity extends TenantEntity { /** * 签收件数 */ - @ApiModelProperty(value = "客户名称") + @ApiModelProperty(value = "签收数量") @TableField(exist = false) private Integer signingNumber; + /** + * 签收件数 + */ + @ApiModelProperty(value = "是否整车") + private Integer isAll; + 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 e10e8915c..df5775b89 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 @@ -81,10 +81,6 @@ import static org.springblade.common.constant.DictBizConstant.OPEN_ORDER_PAY_WAY 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 139021f08..4ceadea8d 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 @@ -170,6 +170,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 0cd669011..d81278078 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 92f561f35..3e6d709c7 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 @@ -93,4 +93,11 @@ public class DistributionDeliveryAllocationDTO { private BigDecimal price; + /** + * 是否整车 + */ + @ApiModelProperty(value = "是否整车") + private Integer isAll; + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index f9367f528..849cc3705 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -3399,12 +3399,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl