From 4f0dca7725bcbd93b4a770274b908af84eb5aa84 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 21 Jun 2023 15:20:22 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=86=97=E4=BD=99=E9=85=8D=E9=80=81=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryInfoEntity.java | 6 +- .../DistributionDeliveryListEntity.java | 48 +++++++++++----- .../entity/DistributionSignforEntity.java | 56 ++++++++++++++----- .../vo/DistributionSigndetailVO.java | 2 +- .../vo/DistributionSignforVO.java | 2 +- .../mapper/DistributionSigndetailMapper.xml | 2 +- .../mapper/DistributionSignforMapper.xml | 2 +- .../DistributionDeliveryListServiceImpl.java | 35 ++++++++---- 8 files changed, 108 insertions(+), 45 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryInfoEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryInfoEntity.java index 96c982f71..9ecc1ce64 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryInfoEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryInfoEntity.java @@ -45,17 +45,17 @@ public class DistributionDeliveryInfoEntity extends TenantEntity { * 配送表id */ @ApiModelProperty(value = "配送表id") - private String deliveryId; + private Long deliveryId; /** * 包条表id */ @ApiModelProperty(value = "包条表id") - private String packageId; + private Long packageId; /** * 订单表id */ @ApiModelProperty(value = "订单表id") - private String orderId; + private Long orderId; /** * 装车状态(1-未装车,2-已装车) */ 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 865cffa96..4416ff3fa 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 @@ -68,10 +68,15 @@ public class DistributionDeliveryListEntity extends TenantEntity { @ApiModelProperty(value = "车次") private String trainNumber; /** - * 仓库 + * 仓库id */ - @ApiModelProperty(value = "仓库") - private String warehouse; + @ApiModelProperty(value = "仓库id") + private String warehouseId; + /** + * 仓库名称 + */ + @ApiModelProperty(value = "仓库名称") + private String warehouseName; /** * 配送类型;1-市配,2-商配 */ @@ -84,15 +89,25 @@ public class DistributionDeliveryListEntity extends TenantEntity { @ApiModelProperty(value = "配送类型;1-自主配送,2-三方配送") private String kind; /** - * 配送车辆 + * 配送车辆(id) + */ + @ApiModelProperty(value = "配送车辆(id)") + private String vehicleId; + /** + * 配送司机(id) */ - @ApiModelProperty(value = "配送车辆") - private String vehicle; + @ApiModelProperty(value = "配送司机(id)") + private String driverId; /** - * 配送司机 + * 配送车辆(名称) */ - @ApiModelProperty(value = "配送司机") - private String driver; + @ApiModelProperty(value = "配送车辆(名称)") + private String vehicleName; + /** + * 配送司机（名称） + */ + @ApiModelProperty(value = "配送司机（名称）") + private String driverName; /** * 配送公司;1-货拉拉,2-京东 */ @@ -134,14 +149,19 @@ public class DistributionDeliveryListEntity extends TenantEntity { @ApiModelProperty(value = "扫描件数") private Integer scannedNumber; /** - * 装卸班组 + * 装卸班组（id） + */ + @ApiModelProperty(value = "装卸班组（id）") + private String loadingTeamId; + /** + * 装卸班组(名称) */ - @ApiModelProperty(value = "装卸班组") - private String loadingTeam; + @ApiModelProperty(value = "装卸班组(名称)") + private String loadingTeamName; /** - * 预约表id（客户） + * 关联预约表id（客户） */ - @ApiModelProperty(value = "预约表id(客户)") + @ApiModelProperty(value = "关联预约表id(客户)") private String reservationId; /** * 关联订单id diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java index 5cb8bcb0a..0d715a1ad 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java @@ -73,15 +73,20 @@ public class DistributionSignforEntity extends TenantEntity { @ApiModelProperty(value = "预约关联Id;预约关联id") private Long reservationId; /** - * 收货人 + * 收货人(id) */ - @ApiModelProperty(value = "收货人") - private String consignee; + @ApiModelProperty(value = "收货人(id)") + private String consigneeId; + /** + * 收货人(名称) + */ + @ApiModelProperty(value = "收货人(名称)") + private String consigneeName; /** * 收货人手机 */ @ApiModelProperty(value = "收货人手机") - private String consigneePhone; + private String deliveryPhone; /** * 收货地址 */ @@ -90,13 +95,18 @@ public class DistributionSignforEntity extends TenantEntity { /** * 服务类型 */ - @ApiModelProperty(value = "服务类型") + @ApiModelProperty(value = "服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；") private String serveType; /** - * 配送仓库 + * 配送仓库(id) */ @ApiModelProperty(value = "配送仓库") - private String distributingWarehouse; + private String warehouseId; + /** + * 配送仓库(名称) + */ + @ApiModelProperty(value = "配送仓库(名称)") + private String warehouseName; /** * 配送车次 */ @@ -123,10 +133,15 @@ public class DistributionSignforEntity extends TenantEntity { @ApiModelProperty(value = "签收数") private Integer receivedQuantity; /** - * 送货司机 + * 送货司机(id) + */ + @ApiModelProperty(value = "送货司机(id)") + private String deliveryDriverId; + /** + * 送货司机(名称) */ - @ApiModelProperty(value = "送货司机") - private String deliveryDriver; + @ApiModelProperty(value = "送货司机(名称)") + private String deliveryDriverName; /** * 送货司机手机号 */ @@ -145,10 +160,15 @@ public class DistributionSignforEntity extends TenantEntity { // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private String sjsigningTime; /** - * 签收人 + * 签收人(id) */ - @ApiModelProperty(value = "签收人") - private String signee; + @ApiModelProperty(value = "签收人(id)") + private String signeeId; + /** + * 签收人(名称) + */ + @ApiModelProperty(value = "签收人(名称)") + private String signeeName; /** * 签收状态;1-未签收,2-司机签收,3-文员签收 */ @@ -179,6 +199,16 @@ public class DistributionSignforEntity extends TenantEntity { */ @ApiModelProperty(value = "备注") private String notes; + /** + * 送货车辆(id) + */ + @ApiModelProperty(value = "送货车辆(id)") + private String deliveryVehicleId; + /** + * 送货车辆(值) + */ + @ApiModelProperty(value = "送货车辆(值)") + private String deliveryVehicleName; /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java index d78f9191d..88324e366 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java @@ -46,7 +46,7 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity { * 客户电话 */ @ApiModelProperty(value = "客户电话") - private String consigneePhone; + private String deliveryPhone; /** * 收货地址 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java index 31d6a1a1c..90f4dfd89 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java @@ -17,6 +17,7 @@ package com.logpm.distribution.vo; import com.logpm.distribution.entity.DistributionSignforEntity; +import io.swagger.annotations.ApiModelProperty; import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; @@ -31,5 +32,4 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class DistributionSignforVO extends DistributionSignforEntity { private static final long serialVersionUID = 1L; - } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml index b7c86aba3..5ebce6708 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml @@ -57,7 +57,7 @@ ldsf.consignee consignee, ldsf.signing_time signingTime, ldsf.sjsigning_time sjsigningTime, - ldsf.consignee_phone consigneePhone, + ldsf.delivery_phone deliveryPhone, ldsf.delivery_address deliveryAddress FROM logpm_distribution_signdetail ldsd diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 2dcbcdb78..f98112f02 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -39,7 +39,7 @@ - + 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 2639fb2f0..bf13a53a6 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 @@ -16,15 +16,16 @@ */ package com.logpm.distribution.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.distribution.dto.DistributionDeliveryListDTO; -import com.logpm.distribution.entity.DistributionDeliveryListEntity; -import com.logpm.distribution.entity.DistributionPackadeliEntity; -import com.logpm.distribution.mapper.DistributionPackadeliMapper; +import com.logpm.distribution.dto.DistributionSignforDTO; +import com.logpm.distribution.entity.*; +import com.logpm.distribution.mapper.*; import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; -import com.logpm.distribution.mapper.DistributionDeliveryListMapper; import com.logpm.distribution.service.IDistributionDeliveryListService; import com.logpm.distribution.vo.DistributionPackadeliVO; +import com.logpm.distribution.vo.DistributionSignforVO; import com.logpm.distribution.vo.DistributionstatisticsnmbVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -54,6 +55,10 @@ import java.util.List; @Slf4j public class DistributionDeliveryListServiceImpl extends BaseServiceImpl implements IDistributionDeliveryListService { private final DistributionPackadeliMapper distributionPackadeliMapper; + private final DistributionDeliveryInfoMapper distributionDeliveryInfoMapper; + private final DistributionReservationMapper distributionReservationMapper; + private final DistributionSignforMapper distributionSignforMapper; + @Override public IPage selectDistributionDeliveryListPage(IPage page, DistributionDeliveryListVO distributionDeliveryList) { return page.setRecords(baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList)); @@ -73,7 +78,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl list = distributionPackadeliMapper.selectjointList(detail.getId()); distributionDeliveryListVO.setPackadeList(list); @@ -83,7 +88,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>{}",distributionDeliveryList); + log.info("开始发车>>>>>>>>>{}", distributionDeliveryList); //获取关联的客户信息 String reservationId = distributionDeliveryList.getReservationId(); List reservationIds = Arrays.asList(Long.valueOf(String.valueOf(reservationId.split(",")))); - //查询客户信息 + //查询客户信息,装车情况 + List distributionDeliveryInfoEntities = distributionDeliveryInfoMapper.selectList(new QueryWrapper().lambda() + .eq(DistributionDeliveryInfoEntity::getLoadedState, "2") + .in(null != reservationIds && reservationIds.size() > 0, DistributionDeliveryInfoEntity::getReservationId, reservationIds) + ); + //统计客户的配送数量,加入签收表(通过预约单查询总数量) + List distributionReservationEntities = distributionReservationMapper.selectBatchIds(reservationIds); + DistributionSignforVO distributionSignforVO = new DistributionSignforVO(); //插入配送管理表 + //获取关联订单 String orderId = distributionDeliveryList.getOrderId(); List orderIds = Arrays.asList(Long.valueOf(String.valueOf(orderId.split(","))));