From 1c32f1e24da55157aa1cb623293af0374bdb179d Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 19 Jun 2023 09:19:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=B7=E6=A0=BC=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/vo/BasicdataTeamGroupVO.java | 4 + .../entity/DistributionStockupEntity.java | 8 + .../vo/DistributionStockupVO.java | 4 + .../BasicdataTeamGroupController.java | 11 + .../mapper/BasicdataTeamGroupMapper.java | 1 + .../mapper/BasicdataTeamGroupMapper.xml | 8 + .../service/IBasicdataTeamGroupService.java | 3 + .../impl/BasicdataTeamGroupServiceImpl.java | 10 + .../DistributionStockupController.java | 13 +- .../mapper/DistributionStockupMapper.java | 1 + .../mapper/DistributionStockupMapper.xml | 10 + .../service/IDistributionStockupService.java | 4 + .../impl/DistributionStockupServiceImpl.java | 32 + doc/dpm/物流租户系统.pdma.json | 1273 +++++++++++++++++ 14 files changed, 1381 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamGroupVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamGroupVO.java index 7eaee0d2c..7d9bfc8b6 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamGroupVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTeamGroupVO.java @@ -31,5 +31,9 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class BasicdataTeamGroupVO extends BasicdataTeamGroupEntity { private static final long serialVersionUID = 1L; + /** + * 仓库名称 + */ + private String name; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java index ae971ec9d..be07a8d89 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; @@ -46,6 +47,13 @@ public class DistributionStockupEntity extends TenantEntity { */ @ApiModelProperty(value = "备货人") private String stockupUser; + + /** + * ids + */ + @TableField(exist = false) + @ApiModelProperty(value = "备货人") + private String ids; /** * 备货状态 */ 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 c11998459..4e40da9c4 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 @@ -32,4 +32,8 @@ import lombok.EqualsAndHashCode; public class DistributionStockupVO extends DistributionStockupEntity { private static final long serialVersionUID = 1L; + private String headline; + + private String groupName; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java index ee2294b5b..599bfb174 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java @@ -79,6 +79,17 @@ public class BasicdataTeamGroupController extends BladeController { return R.data(pages); } + /** + * 基础班组表 分页 + */ + @GetMapping("/listTeam") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataTeamGroup") + public R> listTeam(@ApiIgnore @RequestParam Map basicdataTeamGroup, Query query) { + IPage pages = basicdataTeamGroupService.listTeam(Condition.getPage(query), basicdataTeamGroup); + return R.data(pages); + } + /** * 基础班组表 自定义分页 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.java index b545f81b6..a0f48a760 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.java @@ -51,4 +51,5 @@ public interface BasicdataTeamGroupMapper extends BaseMapper exportBasicdataTeamGroup(@Param("ew") Wrapper queryWrapper); + IPage listTeam(IPage page, @Param("param") BasicdataTeamGroupEntity basicdataTeamGroupEntity); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml index d46564409..a6cbedd62 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml @@ -28,6 +28,14 @@ + select * from logpm_distribution_stockup where is_deleted = 0 +