From 46725088a8c8d7e0f0d64be4e0f001b4bfe0c5dc Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Sat, 22 Jul 2023 10:48:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ModuleNameConstant.java | 2 +- .../vo/DistributionStockupVO.java | 25 ++++++++++++++++ .../DistributionStockupController.java | 19 ++++++++++++ .../mapper/DistributionStockupMapper.java | 4 +++ .../mapper/DistributionStockupMapper.xml | 29 +++++++++++++++++++ .../IDistributionReservationService.java | 1 + .../service/IDistributionStockupService.java | 15 ++++++++++ .../impl/DistributionStockupServiceImpl.java | 22 ++++++++++++++ 8 files changed, 116 insertions(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index bbc73d67c..b2ce75fed 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-cyz"; /** 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 4e40da9c4..948c9ef3c 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 @@ -21,6 +21,8 @@ import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * 备货信息表 视图实体类 * @@ -35,5 +37,28 @@ public class DistributionStockupVO extends DistributionStockupEntity { private String headline; private String groupName; + //备货编码 + private String stockupCode; + //备货人 + private String stockupUser; + //备货状态 + private String stockupStatus; + //预约时间 + private Date reservationDate; + //服务类型 + private String serveType; + //配送方式 + private String deliveryWay; + //配送类型 + private String deliveryType; + //配送车次号 + private String trainNumber; + //备货区名称 + private String stockupArea; + private String consignee; + private String deliveryAddress; + private String deliveryPhone; + private String mallName; + private String stockArticleId; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java index 4697dadc2..554c3a2d1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java @@ -69,6 +69,25 @@ public class DistributionStockupController extends BladeController { DistributionStockupEntity detail = distributionStockupService.getOne(Condition.getQueryWrapper(distributionStockup)); return R.data(detail); } + /** + * 备货信息表 详情 + */ + @GetMapping("/detailOwn") + @ApiOperation(value = "详情", notes = "传入distributionStockup") + public R detailOwn(DistributionStockupEntity distributionStockup) { + DistributionStockupVO detail = distributionStockupService.getOneOwn(distributionStockup.getId()); + return R.data(detail); + } + + /** + * 备货信息表 预约信息 详情 + */ + @GetMapping("/detailReservationOwn") + @ApiOperation(value = "详情", notes = "传入distributionStockup") + public R> detailReservationOwn(Query query,DistributionStockupEntity distributionStockup) { + IPage detail = distributionStockupService.detailReservationOwn(Condition.getPage(query),distributionStockup.getId()); + return R.data(detail); + } /** * 备货信息表 分页 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java index aed2c332a..71d0fe619 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java @@ -61,4 +61,8 @@ public interface DistributionStockupMapper extends BaseMapper detailReservationOwn(IPage page,@Param("id") Long id); } 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 8d671800c..e8828d993 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 @@ -106,5 +106,34 @@ where ldrs.reservation_id = #{reservationId} + + + + 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 5d0997c8a..016fa53bd 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 @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionDeliveryAllocationDTO; import com.logpm.distribution.dto.DistributionReservationDTO; import com.logpm.distribution.entity.DistributionReservationEntity; +import com.logpm.distribution.entity.DistributionStockupEntity; import com.logpm.distribution.excel.DistributionReservationExcel; import com.logpm.distribution.vo.DistributionReservationVO; import com.logpm.distribution.vo.DistributionStockupOrderListVO; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index 161c7a92b..77927c0e3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -64,4 +64,19 @@ public interface IDistributionStockupService extends BaseService detailReservationOwn(IPage page,Long id); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 8d587d0a6..bbc74a4b3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -258,5 +258,27 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl detailReservationOwn(IPage page, Long id) { + return baseMapper.detailReservationOwn(page,id); + } + }