From 8d1aff10e4e149826750aa00845256e4c5505808 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 2 Aug 2023 23:13:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8E=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/DictBizConstant.java | 5 ++- .../DistributionDeliveryListEntity.java | 9 ++--- .../entity/DistributionParcelListEntity.java | 6 ++-- .../DistributionStockArticleEntity.java | 3 +- .../entity/DistributionStockListEntity.java | 2 +- .../vo/DistributionReservationVO.java | 6 ++-- .../vo/DistributionStockupVO.java | 3 +- .../DistributionReservationController.java | 29 ++++++++-------- .../mapper/DistributionDeliveryInfoMapper.xml | 10 +++--- .../mapper/DistributionParcelListMapper.xml | 2 +- .../mapper/DistributionReservationMapper.xml | 2 +- .../mapper/DistributionStockArticleMapper.xml | 2 +- .../mapper/DistributionStockupMapper.xml | 2 +- .../DistributionDeliveryListServiceImpl.java | 29 +++++++--------- .../DistributionReservationServiceImpl.java | 33 ++++++++++--------- .../DistributionStockArticleServiceImpl.java | 11 +++---- .../DistributionStockListServiceImpl.java | 2 +- .../DistrilbutionBillLadingServiceImpl.java | 4 +-- .../DistributionReservationWrapper.java | 33 +++++++++++++++++++ .../DistributionStockArticleWrapper.java | 6 +++- .../impl/WarehouseWaybillServiceImpl.java | 4 +-- 21 files changed, 116 insertions(+), 87 deletions(-) create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionReservationWrapper.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 8ddaa29b7..89719ca7a 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,7 +15,7 @@ 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 = "reservation_status";//预约状态 + public static final String RESERVATION_STATUS = "order_reservation_status";//预约状态 public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态 @@ -25,5 +25,8 @@ public class DictBizConstant { public static final String PDA_AUDIO = "pda_audio";//PDA扫码语音 + //--------------2023-08-02 --------------------- + public static final String PERIOD_OF_TIME = "period_of_time";//时段 + } 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 dcb064837..19eadfc9f 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 @@ -17,14 +17,15 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.math.BigDecimal; +import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.math.BigDecimal; +import java.util.Date; + /** * 配送管理 实体类 * @@ -203,7 +204,7 @@ public class DistributionDeliveryListEntity extends TenantEntity { * 订单自编号 */ @ApiModelProperty(value = "订单自编号") - private String orderSelfNumbering; + private String orderCode; /** * 备货时间 */ 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 16806c553..0be56b338 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,8 +24,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; -import java.math.BigInteger; - /** * 在库订单包件清单 实体类 * @@ -67,7 +65,7 @@ public class DistributionParcelListEntity extends TenantEntity { * 订单自编号 */ @ApiModelProperty(value = "订单自编号") - private String orderSelfNumbering; + private String orderCode; /** * 仓库 */ @@ -86,7 +84,7 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "包条码") @TableField("order_package_code") - private String packetBarCode; + private String orderPackageCode; @ApiModelProperty(value = "货区信息") private String cargoTitle; 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 64f0c8b31..94ba229a1 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 @@ -27,7 +27,6 @@ import org.springblade.core.tenant.mp.TenantEntity; import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** * 配送在库订单 实体类 @@ -83,7 +82,7 @@ public class DistributionStockArticleEntity extends TenantEntity { * 订单自编号 */ @ApiModelProperty(value = "订单自编号") - private String orderSelfNumbering; + private String orderCode; /** * 门店id diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java index 9c4fc8fa1..b51a701c2 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java @@ -78,7 +78,7 @@ public class DistributionStockListEntity extends TenantEntity { * 订单自编号 */ @ApiModelProperty(value = "订单自编号") - private String orderSelfNumbering; + private String orderCode; /** * 在库订单ID */ 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 12dfae1a4..26e1b2e78 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 @@ -16,10 +16,7 @@ */ package com.logpm.distribution.vo; -import com.logpm.distribution.entity.DistributionAddvalueEntity; import com.logpm.distribution.entity.DistributionReservationEntity; -import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.distribution.entity.DistributionStockListEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -37,6 +34,9 @@ import java.util.List; public class DistributionReservationVO extends DistributionReservationEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "时段名称") + private String periodOfTimeName; + /** * 库存品信息列表 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java index de94d6eef..9eb53c935 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java @@ -17,7 +17,6 @@ package com.logpm.distribution.vo; import com.logpm.distribution.entity.DistributionStockupEntity; -import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; @@ -61,7 +60,7 @@ public class DistributionStockupVO extends DistributionStockupEntity { private String deliveryPhone; private String mallName; private String stockArticleId; - private String orderSelfNumbering; //订单自编号 + private String orderCode; //订单自编号 private String descriptionGoods; private String reservationNum; private Date stockupDate; 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 86395b05e..d2c3b3b43 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 @@ -16,35 +16,36 @@ */ package com.logpm.distribution.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionDeliveryAllocationDTO; import com.logpm.distribution.dto.DistributionReservationDTO; import com.logpm.distribution.entity.DistributionReservationEntity; import com.logpm.distribution.excel.DistributionReservationExcel; import com.logpm.distribution.service.IDistributionReservationService; import com.logpm.distribution.vo.DistributionReservationVO; +import com.logpm.distribution.wrapper.DistributionReservationWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; -import javax.validation.Valid; - -import org.springblade.core.secure.BladeUser; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; 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.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; -import java.util.Map; -import java.util.List; + import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.List; +import java.util.Map; /** * 预约列表 控制器 @@ -77,9 +78,9 @@ public class DistributionReservationController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distrbutionReservation") - public R> list(@ApiIgnore @RequestParam Map distrbutionReservation, Query query) { + public R> list(@ApiIgnore @RequestParam Map distrbutionReservation, Query query) { IPage pages = reservationService.page(Condition.getPage(query), Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class)); - return R.data(pages); + return R.data(DistributionReservationWrapper.build().pageVO(pages)); } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index cb922dff4..e96a6a5f2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -171,7 +171,7 @@