From 1cf68659cc7e7be246cb5807bb8182885931933f Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 15 Jun 2023 16:24:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionStockListEntity.java | 5 ++ .../entity/DistributionStockupEntity.java | 37 ++++++++++---- .../feign/IDistributionStockupClient.java | 12 ++--- .../vo/DistributionStockupVO.java | 4 +- .../DistributionStockArticleController.java | 10 ++++ .../DistributionStockupController.java | 6 +-- .../dto/DistributionStockupDTO.java | 4 +- .../excel/DistributionStockupExcel.java | 36 ++++++++++++-- .../mapper/DistributionStockupMapper.java | 5 +- .../mapper/DistributionStockupMapper.xml | 11 +++-- .../IDistributionStockArticleService.java | 1 + .../service/IDistributionStockupService.java | 4 +- .../DistributionStockArticleServiceImpl.java | 49 +++++++++++++++++++ .../DistributionStockListServiceImpl.java | 2 + .../impl/DistributionStockupServiceImpl.java | 4 +- doc/dpm/物流租户系统.pdma.json | 2 +- 16 files changed, 156 insertions(+), 36 deletions(-) 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 b2c343ba2..c23cac30a 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 @@ -66,6 +66,11 @@ public class DistributionStockListEntity extends TenantEntity { */ @ApiModelProperty(value = "订单自编号") private String orderSelfNumbering; + /** + * 在库订单ID + */ + @ApiModelProperty(value = "在库订单ID") + private Long stockArticleId; /** * 入库批次号 */ 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 67ab4b4cc..ae971ec9d 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 @@ -17,12 +17,9 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.time.LocalDate; import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; @@ -30,8 +27,8 @@ import org.springblade.core.tenant.mp.TenantEntity; /** * 备货信息表 实体类 * - * @author Tjj - * @since 2023-06-14 + * @author cyz + * @since 2023-06-15 */ @Data @TableName("logpm_distribution_stockup") @@ -43,9 +40,6 @@ public class DistributionStockupEntity extends TenantEntity { * 备货时间 */ @ApiModelProperty(value = "备货时间") - @JsonFormat( - pattern = "yyyy-MM-dd" - ) private Date stockupDate; /** * 备货人 @@ -61,7 +55,7 @@ public class DistributionStockupEntity extends TenantEntity { * 备货区 */ @ApiModelProperty(value = "备货区") - private Long goodsAreaId; + private String stockupArea; /** * 指派状态;1-未指派、2-已指派 */ @@ -102,5 +96,30 @@ public class DistributionStockupEntity extends TenantEntity { */ @ApiModelProperty(value = "预留5") private String reserve5; + /** + * 备货区编号 + */ + @ApiModelProperty(value = "备货区编号") + private Long goodsAreaId; + /** + * 叉车司机 + */ + @ApiModelProperty(value = "叉车司机") + private Long forklift; + /** + * 装卸班组 + */ + @ApiModelProperty(value = "装卸班组") + private Long loader; + /** + * 确认完成备货时间 + */ + @ApiModelProperty(value = "确认完成备货时间") + private Date fixTime; + /** + * 指派时间 + */ + @ApiModelProperty(value = "指派时间") + private Date assignTime; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupClient.java index 637b30462..5a0305391 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupClient.java @@ -25,16 +25,16 @@ import org.springframework.web.bind.annotation.RequestParam; /** * 备货信息表 Feign接口类 * - * @author Tjj - * @since 2023-06-14 + * @author cyz + * @since 2023-06-15 */ @FeignClient( - value = "stockup" + value = "blade-distributionStockup" ) public interface IDistributionStockupClient { - String API_PREFIX = "stockup/client"; - String TOP = API_PREFIX + "/top"; + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/to2p"; /** * 获取备货信息表列表 @@ -44,6 +44,6 @@ public interface IDistributionStockupClient { * @return BladePage */ @GetMapping(TOP) - BladePage stockupTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); } 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 30b29f28b..c11998459 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 @@ -24,8 +24,8 @@ import lombok.EqualsAndHashCode; /** * 备货信息表 视图实体类 * - * @author Tjj - * @since 2023-06-14 + * @author cyz + * @since 2023-06-15 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 8a59b81ec..857ea72a7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -100,6 +100,16 @@ public class DistributionStockArticleController extends BladeController { return R.status(distributionStockArticleService.save(distributionStockArticle)); } + /** + * 配送在库订单 新增 + */ + @PostMapping("/saveStock") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入distributionStockArticle") + public R saveStock(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(distributionStockArticleService.saveStock(ids)); + } + /** * 配送在库订单 修改 */ 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 3c598ffd2..b8b3e9887 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 @@ -47,12 +47,12 @@ import javax.servlet.http.HttpServletResponse; /** * 备货信息表 控制器 * - * @author Tjj - * @since 2023-06-14 + * @author cyz + * @since 2023-06-15 */ @RestController @AllArgsConstructor -@RequestMapping("/stockup") +@RequestMapping("/distributionStockup") @Api(value = "备货信息表", tags = "备货信息表接口") public class DistributionStockupController extends BladeController { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java index 7b4038bdb..aee0dccf0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java @@ -23,8 +23,8 @@ import lombok.EqualsAndHashCode; /** * 备货信息表 数据传输对象实体类 * - * @author Tjj - * @since 2023-06-14 + * @author cyz + * @since 2023-06-15 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupExcel.java index 73f66b956..45fc07bd0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupExcel.java @@ -30,8 +30,8 @@ import java.io.Serializable; /** * 备货信息表 Excel实体类 * - * @author Tjj - * @since 2023-06-14 + * @author cyz + * @since 2023-06-15 */ @Data @ColumnWidth(25) @@ -46,7 +46,7 @@ public class DistributionStockupExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("租户号") - private String tenantId; + private Long tenantId; /** * 是否已删除 */ @@ -119,5 +119,35 @@ public class DistributionStockupExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("预留5") private String reserve5; + /** + * 备货区编号 + */ + @ColumnWidth(20) + @ExcelProperty("备货区编号") + private Long goodsAreaId; + /** + * 叉车司机 + */ + @ColumnWidth(20) + @ExcelProperty("叉车司机") + private Long forklift; + /** + * 装卸班组 + */ + @ColumnWidth(20) + @ExcelProperty("装卸班组") + private Long loader; + /** + * 确认完成备货时间 + */ + @ColumnWidth(20) + @ExcelProperty("确认完成备货时间") + private Date fixTime; + /** + * 指派时间 + */ + @ColumnWidth(20) + @ExcelProperty("指派时间") + private Date assignTime; } 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 38ec56b45..df10ad6ce 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 @@ -28,8 +28,8 @@ import java.util.List; /** * 备货信息表 Mapper 接口 * - * @author Tjj - * @since 2023-06-14 + * @author cyz + * @since 2023-06-15 */ public interface DistributionStockupMapper extends BaseMapper { @@ -51,5 +51,4 @@ public interface DistributionStockupMapper extends BaseMapper exportDistributionStockup(@Param("ew") Wrapper queryWrapper); - } 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 5ad57f529..fbd94b937 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 @@ -4,6 +4,7 @@ + @@ -12,21 +13,25 @@ - - + - + + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index c2326a4bf..d1b14c762 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -49,4 +49,5 @@ public interface IDistributionStockArticleService extends BaseService exportDistributionStockArticle(Wrapper queryWrapper); + Boolean saveStock(String ids); } 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 916925db5..2ffe6a6cc 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 @@ -27,8 +27,8 @@ import java.util.List; /** * 备货信息表 服务类 * - * @author Tjj - * @since 2023-06-14 + * @author cyz + * @since 2023-06-15 */ public interface IDistributionStockupService extends BaseService { /** 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 181adac22..af00d0341 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 @@ -17,16 +17,22 @@ package com.logpm.distribution.service.impl; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.logpm.distribution.entity.DistributionStockArticleEntity; +import com.logpm.distribution.entity.DistributionStockListEntity; +import com.logpm.distribution.service.IDistributionStockListService; import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.mapper.DistributionStockArticleMapper; import com.logpm.distribution.service.IDistributionStockArticleService; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.transaction.annotation.Transactional; + import java.util.List; /** @@ -35,10 +41,13 @@ import java.util.List; * @author cyz * @since 2023-06-13 */ +@Slf4j @Service @AllArgsConstructor public class DistributionStockArticleServiceImpl extends BaseServiceImpl implements IDistributionStockArticleService { + private final IDistributionStockListService distributionStockListService; + @Override public IPage selectDistributionStockArticlePage(IPage page, DistributionStockArticleVO distributionStockArticle) { return page.setRecords(baseMapper.selectDistributionStockArticlePage(page, distributionStockArticle)); @@ -54,4 +63,44 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl implements IDistributionStockListService { @Override 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 9542f14aa..15309c444 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 @@ -30,8 +30,8 @@ import java.util.List; /** * 备货信息表 服务实现类 * - * @author Tjj - * @since 2023-06-14 + * @author cyz + * @since 2023-06-15 */ @Service public class DistributionStockupServiceImpl extends BaseServiceImpl implements IDistributionStockupService { diff --git a/doc/dpm/物流租户系统.pdma.json b/doc/dpm/物流租户系统.pdma.json index f004e9105..f6f1afdd0 100644 --- a/doc/dpm/物流租户系统.pdma.json +++ b/doc/dpm/物流租户系统.pdma.json @@ -47502,4 +47502,4 @@ } ], "dbConn": [] -} \ No newline at end of file +}