From e2afdd586d286ff28673ad569119b42c3841ed63 Mon Sep 17 00:00:00 2001 From: kilo Date: Wed, 2 Aug 2023 18:34:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E6=9F=A5=E7=9C=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListEntity.java | 7 ++ .../entity/DistributionParcelListEntity.java | 4 +- .../DistributionStockArticleEntity.java | 24 +++---- .../DistributionReservationController.java | 15 ++++- .../dto/DistributionReservationDTO.java | 4 +- .../dto/DistributionStockArticleDTO.java | 20 +++++- .../mapper/DistributionReservationMapper.java | 8 +++ .../mapper/DistributionReservationMapper.xml | 66 ++++++++++++++++++- .../IDistributionReservationService.java | 7 ++ .../DistributionReservationServiceImpl.java | 34 ++++++++-- .../DistributionStockArticleServiceImpl.java | 2 +- 11 files changed, 159 insertions(+), 32 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 4602d8159..a4ecfb54b 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 @@ -247,6 +247,13 @@ public class DistributionDeliveryListEntity extends TenantEntity { @ApiModelProperty(value = "定位打卡地址") private String positioningAdr; + /** + * 定位打卡地址 + */ + @ApiModelProperty(value = "定位打卡地址") + private String deliveryState; + + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index 034377395..d31805b5b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -24,6 +24,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.math.BigInteger; + /** * 在库订单包件清单 实体类 * @@ -167,7 +169,7 @@ public class DistributionParcelListEntity extends TenantEntity { * 品牌ID */ @ApiModelProperty(value = "品牌ID") - private String brandId; + private Long brandId; /** * 品牌名称 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index a586db6b5..a2e42b7e8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -208,12 +208,12 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") private String orderStatus; - /** - * 状态;1 配送 2 待配送 3部分入库 4已入库 - */ - @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") - @TableField(exist = false) - private String stateName; +// /** +// * 状态;1 配送 2 待配送 3部分入库 4已入库 +// */ +// @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") +// @TableField(exist = false) +// private String stateName; /** * 状态;1 已通知 2 未通知 @@ -267,17 +267,9 @@ public class DistributionStockArticleEntity extends TenantEntity { - /** - * 包件数量 - */ - @TableField(exist = false) - private List packageList; - /** - * 订单是否出现包件修改 - */ - @TableField(exist = false) - private Boolean isUpdate = false; + + //-------------2023-07-16 新增在库订单字段 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 bd95cc01b..86395b05e 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 @@ -244,7 +244,7 @@ public class DistributionReservationController extends BladeController { } /** - * 预约列表 详情 + * 查询预约单订单列表 */ @GetMapping("/getReservationPackage") @ApiOperationSupport(order = 1) @@ -255,7 +255,7 @@ public class DistributionReservationController extends BladeController { } /** - * 预约列表 详情 + * 查询预约单包件信息列表 */ @GetMapping("/getReservationPackageList") @ApiOperationSupport(order = 1) @@ -264,4 +264,15 @@ public class DistributionReservationController extends BladeController { R reservationPackage = reservationService.getReservationPackageList(reservationId); return reservationPackage; } + + /** + * 预约列表 详情 + */ + @GetMapping("/getReservationStockListInfo") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrbutionReservation") + public R getReservationStockListInfo(@RequestParam String reservationId) { + R reservationPackage = reservationService.getReservationStockListInfo(reservationId); + return reservationPackage; + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java index 056219aa8..e152705a6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java @@ -54,13 +54,13 @@ public class DistributionReservationDTO extends DistributionReservationEntity { * 库存品信息列表 */ @ApiModelProperty(value = "库存品信息列表") - private List inventoryList; + private List inventoryList; /** * 订单信息列表 */ @ApiModelProperty(value = "订单信息列表") - private List stockArticleList; + private List stockArticleList; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java index ac1324a19..bfc6ecb05 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java @@ -16,7 +16,9 @@ */ package com.logpm.distribution.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.logpm.distribution.entity.DistributionAddvalueEntity; +import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -38,12 +40,24 @@ public class DistributionStockArticleDTO extends DistributionStockArticleEntity private String ids; +// +// /** +// * 包件信息 +// */ +// @ApiModelProperty(value = "包件信息") +// private List distributionParcelListDTO; /** - * 包件信息 + * 订单是否出现包件修改 */ - @ApiModelProperty(value = "包件信息") - private List distributionParcelListDTO; + @TableField(exist = false) + private Boolean isUpdate = false; + + /** + * 包件数量 + */ + @TableField(exist = false) + private List packageList; } 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 aad71f231..af98a6783 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 @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionReservationDTO; import com.logpm.distribution.entity.DistributionReservationEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; +import com.logpm.distribution.entity.DistributionStockListEntity; import com.logpm.distribution.excel.DistributionReservationExcel; import com.logpm.distribution.vo.DistributionReservationVO; import com.logpm.distribution.vo.DistributionStockArticleVO; @@ -106,4 +107,11 @@ public interface DistributionReservationMapper extends BaseMapper getReservationStockListInfo(@Param("reservationId") String 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 964b4ea05..14feceb70 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 @@ -114,7 +114,7 @@ ldsa.customer_telephone, ldsa.customer_address, ldsa.genre, - ldsa.state, + ldsa.order_status, ldsa.notification, ldsa.fee, ldsa.rate, @@ -422,5 +422,69 @@ + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java index cab0aaac4..8b11d369f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java @@ -157,4 +157,11 @@ public interface IDistributionReservationService extends BaseService getReservationStockListInfo(String reservationId); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 8976bf1ea..d4b9996eb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -202,9 +202,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl stockArticleList = distributionReservationDTO.getStockArticleList(); + List stockArticleList = distributionReservationDTO.getStockArticleList(); //获取库存品列表信息 - List inventoryList = distributionReservationDTO.getInventoryList(); + List inventoryList = distributionReservationDTO.getInventoryList(); //订单数量统计 AtomicInteger stockArticleCount = new AtomicInteger(); @@ -252,6 +252,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl initTotal = new AtomicReference<>(BigDecimal.ZERO); //订单自编号拼接 HashSet hashSet = new HashSet<>(); - List stockArticleList = distributionReservationDTO.getStockArticleList(); + List stockArticleList = distributionReservationDTO.getStockArticleList(); if (!Func.isEmpty(stockArticleList)) { //这里判断修改内容是否存在订单信息，如果存在则进行中间表数据的重新插入 stockArticleList.forEach(s -> { List packageList = s.getPackageList(); AtomicInteger packageNum = new AtomicInteger(); - if (packageList.size() == 0) { + if (Func.isEmpty(packageList)) { Map map = new HashMap<>(); map.put("stockArticleId", s.getId()); QueryWrapper qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class); @@ -787,7 +804,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl inventoryList = distributionReservationDTO.getInventoryList(); + List inventoryList = distributionReservationDTO.getInventoryList(); AtomicInteger stockListNum = new AtomicInteger(); if (!Func.isEmpty(inventoryList)) { //重新构建预约和库存之间的关系 @@ -1125,4 +1141,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl getReservationStockListInfo(String reservationId) { + List stockListEntityList = baseMapper.getReservationStockListInfo(reservationId); + return R.data(stockListEntityList); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 68ecdd134..0b6485712 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -308,7 +308,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl