From ecaa6ced7091a2b66c061d33fcbb5b9e112e1a33 Mon Sep 17 00:00:00 2001 From: kilo Date: Sat, 5 Aug 2023 17:18:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E3=80=81=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E3=80=81=E9=A2=84=E7=BA=A6=E3=80=81=E5=A4=87=E8=B4=A7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/DictBizConstant.java | 15 +- .../DistributionDeliveryListEntity.java | 2 + .../entity/DistributionReservationEntity.java | 11 +- .../vo/DistributionDeliveryListVO.java | 12 ++ .../vo/DistributionReservationVO.java | 6 + .../DistributionDeliveryListController.java | 21 ++- .../DistributionReservationController.java | 8 +- .../dto/DistributionStockupDTO.java | 8 + .../DistributionDeliveryListMapper.java | 2 +- .../mapper/DistributionDeliveryListMapper.xml | 2 +- .../mapper/DistributionReservationMapper.java | 2 + .../mapper/DistributionReservationMapper.xml | 55 ++++++- ...istributionReservationStocklistMapper.java | 9 ++ ...DistributionReservationStocklistMapper.xml | 56 +++++++ .../mapper/DistributionStockupMapper.xml | 2 +- .../IDistributionDeliveryListService.java | 9 +- .../IDistributionReservationService.java | 2 +- .../DistributionDeliveryListServiceImpl.java | 42 ++++- .../DistributionReservationServiceImpl.java | 149 ++++++++++++------ .../DistributionDeliveryListWrapper.java | 34 ++++ .../DistributionParcelListWrapper.java | 4 +- .../DistributionReservationWrapper.java | 6 +- .../DistributionStockArticleWrapper.java | 2 +- 23 files changed, 388 insertions(+), 71 deletions(-) create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDeliveryListWrapper.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index 78e77f3a6..1201efb12 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -15,13 +15,15 @@ public class DictBizConstant { public static final String BASIC_GROUNDING = "basic_grounding";//上架状态 public static final String STOCKUP_STATUS = "stockup_status";//备货状态 - public static final String RESERVATION_STATUS = "order_reservation_status";//预约状态 + public static final String ORDER_RESERVATION_STATUS = "order_reservation_status";//订单预约状态 + public static final String RESERVATION_STATUS = "reservation_status";//预约状态 public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态 public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包间冻结状态 public static final String ORDER_PACKAGE_STOCKUP_STATUS = "order_package_stockup_status";//包间备货状态 public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包间上架状态 + public static final String ORDER_PACKAGE_RESERVATION_STATUS = "order_package_reservation_status";//包件预约状态 public static final String STOCK_ALLOCATION = "stock_assign_status";//包间上架状态 @@ -34,6 +36,17 @@ public class DictBizConstant { //--------------2023-08-03 --------------------- public static final String ADD_VALUE_SERVE_TYPE = "addvalue_serve_type";//增值服务类型 + //--------------2023-08-04 --------------------- + + public static final String DELIVERY_WAY = "delivery_way";//增值服务类型 + + // --------------2023-08-05 --------------------- + + public static final String DISTRIBUTION_DELIVERY_STATUS = "distribution_delivery_status";//配送状态 + + public static final String DISTRIBUTION_DELIVERY_KiIND = "distribution_deliverylist_kind";//配送种类 + + 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 577ce5f51..a11ae7108 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 @@ -239,6 +239,8 @@ public class DistributionDeliveryListEntity extends TenantEntity { private Integer source; + + // /** // * 定位打卡地址 // */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java index 7c55ef16d..40a15ff27 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java @@ -96,7 +96,7 @@ public class DistributionReservationEntity extends TenantEntity { @ApiModelProperty(value = "收件人电话") private String deliveryPhone; /** - * 预约信息状态;预约列表信息状态；1-待确认、2-已确认 + * 预约信息状态;预约列表信息状态；10-待确认、20-已确认 */ @ApiModelProperty(value = "预约信息状态;预约列表信息状态；1-待确认、2-已确认") private String reservationStatus; @@ -175,6 +175,11 @@ public class DistributionReservationEntity extends TenantEntity { */ @ApiModelProperty(value = "费用汇总") private BigDecimal fee; + /** + * 费用汇总 + */ + @ApiModelProperty(value = "费用汇总") + private BigDecimal collectionFee; /** * 服务类型 */ @@ -185,7 +190,7 @@ public class DistributionReservationEntity extends TenantEntity { /** * 服务号 */ - @TableField(exist = false) +// @TableField(exist = false) @ApiModelProperty(value = "服务号") private String serviceNumber; @@ -199,7 +204,7 @@ public class DistributionReservationEntity extends TenantEntity { * 是否加急 */ @ApiModelProperty(value = "是否加急") - private Integer isUrgent; + private String isUrgent; /** /** * 预留1 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java index 74d0fd868..1bf409bc8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java @@ -93,6 +93,18 @@ public class DistributionDeliveryListVO extends DistributionDeliveryListEntity { @ApiModelProperty(value = "预约信息") private DistributionReservationVO reservationInfo; + /** + * 配送状态字典 + */ + @ApiModelProperty(value = "配送状态字典") + private String deliveryStatusName; + + /** + * 配送状态字典 + */ + @ApiModelProperty(value = "配送状态字典") + private String kindName; + diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java index c163ff021..473226c7c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java @@ -43,6 +43,12 @@ public class DistributionReservationVO extends DistributionReservationEntity { private String deliveryTypeName; + private String reservationStatusName; + + private String stockupStatusName; + + + /** * 库存品信息列表 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 5fd984e4e..b9a461fdd 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 @@ -21,6 +21,7 @@ import com.logpm.distribution.dto.DistributionDeliveryListDTO; import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.service.IDistributionDeliveryInfoService; import com.logpm.distribution.vo.*; +import com.logpm.distribution.wrapper.DistributionDeliveryListWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -131,9 +132,9 @@ public class DistributionDeliveryListController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionDeliveryList") - public R> list(@ApiIgnore @RequestParam Map distributionDeliveryList, Query query) { + public R> list(@ApiIgnore @RequestParam Map distributionDeliveryList, Query query) { IPage pages = distributionDeliveryListService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionDeliveryList, DistributionDeliveryListEntity.class)); - return R.data(pages); + return R.data(DistributionDeliveryListWrapper.build().pageVO(pages)); } @@ -186,8 +187,8 @@ public class DistributionDeliveryListController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入distributionDeliveryList") public R> page(DistributionDeliveryListDTO distributionDeliveryList, Query query) { - IPage pages = distributionDeliveryListService.selectDistributionDeliveryListPage(Condition.getPage(query), distributionDeliveryList); - return R.data(pages); + IPage pages = distributionDeliveryListService.selectDistributionDeliveryListPage(Condition.getPage(query), distributionDeliveryList); + return R.data(DistributionDeliveryListWrapper.build().pageVO(pages)); } /** @@ -292,6 +293,18 @@ public class DistributionDeliveryListController extends BladeController { } + /** + * 配送客户列表 + */ + @GetMapping("/getMarketDeliveryList") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "customArgs") + public R getMarketDeliveryList(@RequestParam String id) { + DistributionDeliveryListVO deliveryListVO = distributionDeliveryListService.getMarketDeliveryList(id); + return R.data(deliveryListVO); + } + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index d2c3b3b43..84becdaca 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -18,6 +18,7 @@ package com.logpm.distribution.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionDeliveryAllocationDTO; import com.logpm.distribution.dto.DistributionReservationDTO; @@ -39,6 +40,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springframework.data.domain.PageRequest; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -182,9 +184,9 @@ public class DistributionReservationController extends BladeController { @GetMapping("/getReservationAddr") @ApiOperationSupport(order = 7) @ApiOperation(value = "查询指定预约信息地址") - public R> getReservationAddr(@ApiParam(value = "主键集合", required = true)@RequestParam String ids) { - List result = reservationService.getReservationAddr(ids); - return R.data(result); + public R> getReservationAddr(@ApiParam(value = "主键集合", required = true)@RequestParam String ids) { + IPage result = reservationService.getReservationAddr(ids); + return R.data(DistributionReservationWrapper.build().pageVO(result)); } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java index ae143d56d..c74061d4a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java @@ -96,6 +96,14 @@ public class DistributionStockupDTO{ @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") private Date stockupDate; + /** + * 出库时间 + */ + @ApiModelProperty(value = "出库时间") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + private Date outboundDate; + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index 4451fb91f..0a58b87ad 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -47,7 +47,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper selectDistributionDeliveryListPage(IPage page, @Param("param") DistributionDeliveryListDTO distributionDeliveryList); + List selectDistributionDeliveryListPage(IPage page, @Param("param") DistributionDeliveryListDTO distributionDeliveryList); /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index cd8e84531..32e34b999 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -51,7 +51,7 @@ - SELECT lddl.id id, lddl.train_number trainNumber, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index af98a6783..f75be5efe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -83,6 +83,8 @@ public interface DistributionReservationMapper extends BaseMapper getDeliveryReservation(@Param("id")Long id); Integer getReservationNumByReservationIdAndStockListId(@Param("reservationId") Long reservationId, @Param("stockListId")Long stockListId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index e514a3290..5e86098c6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -49,7 +49,7 @@ UPDATE logpm_distribution_reservation - reservation_status='2' + reservation_status='20' WHERE is_deleted=0 and @@ -486,5 +486,58 @@ WHERE reservation_id = #{reservationId} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java index 25d34f411..943b2b0f2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.mapper; +import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionReservationStocklistEntity; import com.logpm.distribution.vo.DistributionReservationStocklistVO; import com.logpm.distribution.excel.DistributionReservationStocklistExcel; @@ -62,4 +63,12 @@ public interface DistributionReservationStocklistMapper extends BaseMapper ids); + + /** + * + * @param id + * @param stockArticleId + * @return + */ + List selectReservationPackageNum(@Param("reservationId")Long id,@Param("stockArticleId") Long stockArticleId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml index 7e94f01a2..76c830c7d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml @@ -46,5 +46,61 @@ + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index d029889f0..371c57d05 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -111,7 +111,7 @@ FROM logpm_distribution_stockup_info WHERE - reservation_id = #{id}) + stockup_id = #{id})