From 180abf97b4e23be8ab1495160fc94d58ccf67b36 Mon Sep 17 00:00:00 2001 From: kilo Date: Sat, 28 Oct 2023 18:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=9B=B6=E6=8B=85=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionAddvalueDetailEntity.java | 1 + .../entity/DistributionAddvalueEntity.java | 1 + .../DistributionAddvaluePackageEntity.java | 1 + .../vo/DistributionAddvaluePackageVO.java | 2 + .../vo/DistributionAddvalueVO.java | 2 +- .../DistributionAddvalueAppController.java | 3 +- .../dto/DistributionAddvaluePackageDTO.java | 2 + .../dto/app/DistributionAppAddvalueDTO.java | 9 +- .../mapper/DistributionReservationMapper.java | 6 +- .../mapper/DistributionReservationMapper.xml | 9 +- .../service/IDistributionAddvalueService.java | 3 +- .../impl/DistributionAddvalueServiceImpl.java | 98 ++++++++++++++----- .../impl/DistributionSignforServiceImpl.java | 17 ++-- 13 files changed, 112 insertions(+), 42 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueDetailEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueDetailEntity.java index 23091abdc..4a774a8de 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueDetailEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueDetailEntity.java @@ -123,4 +123,5 @@ public class DistributionAddvalueDetailEntity extends TenantEntity { @ApiModelProperty(value = "公里;用于 平移和超区的附属字段 整数 计量单位按照M 来计算") private Double distance; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java index 479f40d53..6a9da4226 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java @@ -119,4 +119,5 @@ public class DistributionAddvalueEntity extends TenantEntity { @ApiModelProperty(value = "配送Id") private Long deliveryListId; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvaluePackageEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvaluePackageEntity.java index e55e0eb36..91ba6ef5b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvaluePackageEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvaluePackageEntity.java @@ -136,4 +136,5 @@ public class DistributionAddvaluePackageEntity extends TenantEntity implements S @ApiModelProperty(value = "1 全部订单和包间 2 扫码订单和包件 3手动输入") private String recordType; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java index 5ac810562..a716b2e07 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java @@ -32,4 +32,6 @@ import lombok.EqualsAndHashCode; public class DistributionAddvaluePackageVO extends DistributionAddvaluePackageEntity { private static final long serialVersionUID = 1L; + private Integer maxQuantity; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java index 8659da66a..c2f8df15a 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java @@ -40,7 +40,7 @@ public class DistributionAddvalueVO extends DistributionAddvalueEntity { private String packageListIds; //包件列表 - List packageEntityList; + List packageEntityList; private Integer num; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java index 5ab81cf5a..4135ac484 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java @@ -14,6 +14,7 @@ import com.logpm.distribution.service.IDistributionDeliveryListService; import com.logpm.distribution.service.IDistributionReservationService; import com.logpm.distribution.service.IDistributionSignforService; import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl; +import com.logpm.distribution.vo.DistributionAddvaluePackageVO; import com.logpm.distribution.vo.app.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -79,7 +80,7 @@ public class DistributionAddvalueAppController { @ApiOperationSupport(order = 3) @ApiOperation(value = "查询该客户下的所有配送包件信息", notes = "DistributionAppDeliveryListDTO") public R getAllPackageList(@Valid @RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) { - List allPackageList = distributionAddvalueService.getAllPackageList(distributionAppAddvalueDTO); + List allPackageList = distributionAddvalueService.getAllPackageList(distributionAppAddvalueDTO); return R.data(200,allPackageList,"成功"); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java index 727d4e857..f5cd58897 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java @@ -31,4 +31,6 @@ import lombok.EqualsAndHashCode; public class DistributionAddvaluePackageDTO extends DistributionAddvaluePackageEntity { private static final long serialVersionUID = 1L; + private Integer zeroQuantity; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppAddvalueDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppAddvalueDTO.java index 00edfdee3..8092d260b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppAddvalueDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppAddvalueDTO.java @@ -81,7 +81,7 @@ public class DistributionAppAddvalueDTO extends TenantEntity { */ @ApiModelProperty(value = "包件列表") // @NotEmpty(message = "客户Id不能为空") - private List packageEntityList; + private List packageEntityList; /** @@ -142,6 +142,13 @@ public class DistributionAppAddvalueDTO extends TenantEntity { // @NotEmpty(message = "客户Id不能为空") private Long addvalueDetailId; + /** + * 公里数 + */ + @ApiModelProperty(value = "公里数") +// @NotEmpty(message = "客户Id不能为空") + private Integer quantity; + 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 625e19490..a317ff52d 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 @@ -172,14 +172,14 @@ public interface DistributionReservationMapper extends BaseMapper selectAppInventoryListByReservation(@Param("reservationId") Long reservationId); + List selectAppInventoryListByReservation(@Param("reservationId") Long reservationId); /** * 查询客户下的包件信息 * @param reservationId * @return */ - List selectAppPackageListByReservationId(@Param("reservationId")Long reservationId); + List selectAppPackageListByReservationId(@Param("reservationId")Long reservationId); /** * 查询出客户下的库存品订单维度信息 @@ -246,5 +246,5 @@ public interface DistributionReservationMapper extends BaseMapper selectZeroPackageListByReservationId(@Param("reservationId")Long reservationId); //查询零担品类包件信息 - List selectAppZeroPackageListByReservationId(@Param("reservationId")Long reservationId); + List selectAppZeroPackageListByReservationId(@Param("reservationId")Long reservationId); } 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 23d2b33e7..8e3358836 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 @@ -703,7 +703,7 @@ ldr.id = #{reservationId} and ldsld.stock_package_status in ('1','3')