From b354801af961736b0f7e4d8b53f555dd588b19c7 Mon Sep 17 00:00:00 2001 From: aikai Date: Mon, 12 Aug 2024 14:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=8A=A5=E8=AF=84=E8=AE=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/comment/dto/CommentDTO.java | 3 +- .../app/comment/vo/CommentTypeCountVO.java | 2 + .../mysql/comment/WorkLogCommentMapper.java | 18 ++++--- .../comment/WorkLogCommentServiceImpl.java | 4 +- .../mapper/comment/WorkLogCommentMapper.xml | 24 +++++++-- yudao-module-wms/yudao-module-wms-biz/pom.xml | 6 +++ .../admin/depot/DepotController.java | 9 +++- .../admin/depot/vo/DepotPageReqVO.java | 8 ++- .../admin/depot/vo/DepotRespVO.java | 14 ++++- .../admin/depot/vo/DepotSaveReqVO.java | 8 ++- .../admin/depotarea/DepotAreaController.java | 54 ++++++++++--------- .../depotarea/vo/DepotAreaPageReqVO.java | 5 +- .../admin/depotarea/vo/DepotAreaRespVO.java | 10 +++- .../depotarea/vo/DepotAreaSaveReqVO.java | 5 +- .../vo/DepotLocationPageReqVO.java | 8 +-- .../depotlocation/vo/DepotLocationRespVO.java | 6 +-- .../vo/DepotLocationSaveReqVO.java | 6 +-- .../wms/dal/dataobject/depot/DepotDO.java | 29 +++++++--- .../dal/dataobject/depotarea/DepotAreaDO.java | 15 +++++- .../depotlocation/DepotLocationDO.java | 6 +-- .../DepotLocationItemDO.java | 4 ++ .../wms/dal/mysql/depot/DepotMapper.java | 12 +++-- .../dal/mysql/depotarea/DepotAreaMapper.java | 5 +- .../depotlocation/DepotLocationMapper.java | 8 +-- .../rpc/config/RpcConfiguration.java | 8 +-- .../wms/service/depot/DepotService.java | 21 +++++--- .../wms/service/depot/DepotServiceImpl.java | 43 ++++++++++----- .../service/depotarea/DepotAreaService.java | 23 +++++--- .../depotarea/DepotAreaServiceImpl.java | 44 ++++++++++----- .../resources/mapper/depot/DepotMapper.xml | 18 ++++++- .../mapper/depotarea/DepotAreaMapper.xml | 25 ++++++++- 31 files changed, 332 insertions(+), 119 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/dto/CommentDTO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/dto/CommentDTO.java index 8f33d89d..dc8d4cf0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/dto/CommentDTO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/dto/CommentDTO.java @@ -14,7 +14,8 @@ public class CommentDTO { private Integer type; @Schema(description = "是否需要显示日志内容 0否 1是 默认否") private Integer isShowWorkLogContent; - + @Schema(description = "是否展示评论我的日志 0否 1是") + private Integer isCommentOnMyBlog; @Schema(description = "是否查看自己的评论记录 0否 1是") private Integer checkMyselfFlag; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/vo/CommentTypeCountVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/vo/CommentTypeCountVO.java index 09e474ba..a19861df 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/vo/CommentTypeCountVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/vo/CommentTypeCountVO.java @@ -12,5 +12,7 @@ public class CommentTypeCountVO { private Integer commentNum; @Schema(description = "回复数量") private Integer replyNum; + @Schema(description = "收到数量") + private Integer receiveNum; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/comment/WorkLogCommentMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/comment/WorkLogCommentMapper.java index af112886..cb7bf46d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/comment/WorkLogCommentMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/comment/WorkLogCommentMapper.java @@ -1,16 +1,15 @@ package cn.iocoder.yudao.module.system.dal.mysql.comment; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.system.controller.app.comment.dto.CommentDTO; +import cn.iocoder.yudao.module.system.controller.app.comment.vo.CommentPageListVO; +import cn.iocoder.yudao.module.system.controller.app.comment.vo.WorkLogCommentPageReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.comment.WorkLogCommentDO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.system.controller.app.comment.vo.*; import org.apache.ibatis.annotations.Param; /** @@ -35,10 +34,17 @@ public interface WorkLogCommentMapper extends BaseMapperX { } /** - * * @param page * @param dto * @return */ IPage queryCommentPageList(@Param("page") Page page, @Param("dto") CommentDTO dto); -} \ No newline at end of file + + /** + * 收到的评论数量（不包含回复的评论） + * + * @param userId + * @return + */ + Integer selectCountReceiveNum(@Param("userId") Long userId); +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java index 57748803..6441b963 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java @@ -150,9 +150,11 @@ public class WorkLogCommentServiceImpl implements WorkLogCommentService { .and(a -> a.eq(WorkLogCommentDO::getUserId, userId) .or().eq(WorkLogCommentDO::getCommentUserId, userId)) .eq(WorkLogCommentDO::getType, 1))); + + Integer receiveNum = workLogCommentMapper.selectCountReceiveNum(userId); vo.setCommentNum(commentNum); vo.setReplyNum(replyNum); - vo.setAllNum(commentNum + replyNum); + vo.setAllNum(commentNum + replyNum + receiveNum); return vo; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/comment/WorkLogCommentMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/comment/WorkLogCommentMapper.xml index 90c2a9d7..fd85695c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/comment/WorkLogCommentMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/comment/WorkLogCommentMapper.xml @@ -36,7 +36,9 @@ LEFT JOIN system_users AS c ON a.user_id = c.id LEFT JOIN system_users AS d ON a.comment_user_id = d.id LEFT JOIN work_log_comment AS e ON a.comment_id = e.id - + + LEFT JOIN work_log_instance_ext AS f ON f.id = a.work_log_id + and a.work_log_id = #{dto.workLogId} @@ -44,10 +46,24 @@ and a.type = #{dto.type} - - and (a.user_id = #{dto.userId} or a.comment_user_id = #{dto.userId}) + + + and (a.user_id = #{dto.userId} or a.comment_user_id = #{dto.userId}) + + + + + and (a.user_id = #{dto.userId} or a.comment_user_id = #{dto.userId}) + ORDER BY a.create_time DESC - \ No newline at end of file + + diff --git a/yudao-module-wms/yudao-module-wms-biz/pom.xml b/yudao-module-wms/yudao-module-wms-biz/pom.xml index 1a44b3d5..a705f605 100644 --- a/yudao-module-wms/yudao-module-wms-biz/pom.xml +++ b/yudao-module-wms/yudao-module-wms-biz/pom.xml @@ -145,6 +145,12 @@ cn.iocoder.cloud yudao-spring-boot-starter-file + + cn.iocoder.cloud + zn-module-smartfactory-api + 2.0.0-jdk8-snapshot + compile + diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/DepotController.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/DepotController.java index e616ad0b..05ebf9dd 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/DepotController.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/DepotController.java @@ -79,6 +79,13 @@ public class DepotController { return success(BeanUtils.toBean(pageResult, DepotRespVO.class)); } + @GetMapping("/list") + @Operation(summary = "获得仓库管理列表") + public CommonResult> getDepotList(@Valid DepotPageReqVO pageReqVO) { + List list = depotService.getDepotList(pageReqVO); + return success(list); + } + @GetMapping("/export-excel") @Operation(summary = "导出仓库管理 Excel") @PreAuthorize("@ss.hasPermission('wms:depot:export')") @@ -92,4 +99,4 @@ public class DepotController { BeanUtils.toBean(list, DepotRespVO.class)); } -} \ No newline at end of file +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotPageReqVO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotPageReqVO.java index 940fb6d3..9631bfe5 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotPageReqVO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotPageReqVO.java @@ -30,8 +30,14 @@ public class DepotPageReqVO extends PageParam { @Schema(description = "联系电话") private String phone; + @Schema(description = "仓库状态 0禁用 1启用", example = "2") + private Integer status; + + @Schema(description = "备注", example = "随便") + private String remark; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} \ No newline at end of file +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotRespVO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotRespVO.java index e8d8d971..97c9fba9 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotRespVO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotRespVO.java @@ -21,6 +21,10 @@ public class DepotRespVO { @ExcelProperty("工厂id") private Long factoryId; + @Schema(description = "工厂名称", example = "张三") + @ExcelProperty("工厂名称") + private String factoryName; + @Schema(description = "仓库名称", example = "张三") @ExcelProperty("仓库名称") private String depotName; @@ -37,8 +41,16 @@ public class DepotRespVO { @ExcelProperty("联系电话") private String phone; + @Schema(description = "仓库状态 0禁用 1启用", example = "2") + @ExcelProperty("仓库状态 0禁用 1启用") + private Integer status; + + @Schema(description = "备注", example = "随便") + @ExcelProperty("备注") + private String remark; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotSaveReqVO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotSaveReqVO.java index 305ad1f4..928f9ea0 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotSaveReqVO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depot/vo/DepotSaveReqVO.java @@ -28,4 +28,10 @@ public class DepotSaveReqVO { @Schema(description = "联系电话") private String phone; -} \ No newline at end of file + @Schema(description = "仓库状态 0禁用 1启用", example = "2") + private Integer status; + + @Schema(description = "备注", example = "随便") + private String remark; + +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/DepotAreaController.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/DepotAreaController.java index bf150ac5..787fe363 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/DepotAreaController.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/DepotAreaController.java @@ -1,33 +1,32 @@ package cn.iocoder.yudao.module.wms.controller.admin.depotarea; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.*; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotRespVO; +import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.DepotAreaPageReqVO; +import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.DepotAreaRespVO; +import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.DepotAreaSaveReqVO; import cn.iocoder.yudao.module.wms.dal.dataobject.depotarea.DepotAreaDO; import cn.iocoder.yudao.module.wms.service.depotarea.DepotAreaService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 库区管理") @RestController @@ -79,17 +78,24 @@ public class DepotAreaController { return success(BeanUtils.toBean(pageResult, DepotAreaRespVO.class)); } + @GetMapping("/list") + @Operation(summary = "获得库区管理列表") + public CommonResult> getDepotAreaList(@Valid DepotAreaPageReqVO pageReqVO) { + List list = depotAreaService.getDepotAreaList(pageReqVO); + return success(list); + } + @GetMapping("/export-excel") @Operation(summary = "导出库区管理 Excel") @PreAuthorize("@ss.hasPermission('wms:depot-area:export')") @OperateLog(type = EXPORT) public void exportDepotAreaExcel(@Valid DepotAreaPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = depotAreaService.getDepotAreaPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "库区管理.xls", "数据", DepotAreaRespVO.class, - BeanUtils.toBean(list, DepotAreaRespVO.class)); + BeanUtils.toBean(list, DepotAreaRespVO.class)); } -} \ No newline at end of file +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaPageReqVO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaPageReqVO.java index df643d7e..abb2d750 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaPageReqVO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaPageReqVO.java @@ -24,6 +24,9 @@ public class DepotAreaPageReqVO extends PageParam { @Schema(description = "库区名称", example = "张三") private String depotAreaName; + @Schema(description = "库区编号", example = "库区编号") + private String depotAreaNo; + @Schema(description = "库区类别 1产品仓 2废料仓（报损）", example = "2") private Integer depotAreaType; @@ -37,4 +40,4 @@ public class DepotAreaPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} \ No newline at end of file +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaRespVO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaRespVO.java index 10dd2845..2d6cef85 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaRespVO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaRespVO.java @@ -21,6 +21,10 @@ public class DepotAreaRespVO { @ExcelProperty("工厂id") private Long factoryId; + @Schema(description = "工厂名称", example = "张三") + @ExcelProperty("工厂名称") + private String factoryName; + @Schema(description = "仓库id", example = "5545") @ExcelProperty("仓库id") private Long depotId; @@ -29,6 +33,10 @@ public class DepotAreaRespVO { @ExcelProperty("库区名称") private String depotAreaName; + @ExcelProperty("库区编号") + @Schema(description = "库区编号", example = "库区编号") + private String depotAreaNo; + @Schema(description = "库区类别 1产品仓 2废料仓（报损）", example = "2") @ExcelProperty("库区类别 1产品仓 2废料仓（报损）") private Integer depotAreaType; @@ -45,4 +53,4 @@ public class DepotAreaRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaSaveReqVO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaSaveReqVO.java index dd816d05..b3fb2189 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaSaveReqVO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotarea/vo/DepotAreaSaveReqVO.java @@ -22,6 +22,9 @@ public class DepotAreaSaveReqVO { @Schema(description = "库区名称", example = "张三") private String depotAreaName; + @Schema(description = "库区编号", example = "库区编号") + private String depotAreaNo; + @Schema(description = "库区类别 1产品仓 2废料仓（报损）", example = "2") private Integer depotAreaType; @@ -31,4 +34,4 @@ public class DepotAreaSaveReqVO { @Schema(description = "备注", example = "随便") private String remark; -} \ No newline at end of file +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationPageReqVO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationPageReqVO.java index fbb69f51..9b5cb4d8 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationPageReqVO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationPageReqVO.java @@ -25,16 +25,16 @@ public class DepotLocationPageReqVO extends PageParam { private Long depotAreaId; @Schema(description = "行") - private Integer row; + private Integer rowNum; @Schema(description = "列") - private Integer column; + private Integer columnNum; @Schema(description = "层") - private Integer layer; + private Integer layerNum; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} \ No newline at end of file +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationRespVO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationRespVO.java index 6ae5fcba..67086a05 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationRespVO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationRespVO.java @@ -32,15 +32,15 @@ public class DepotLocationRespVO { @Schema(description = "行") @ExcelProperty("行") - private Integer row; + private Integer rowNum; @Schema(description = "列") @ExcelProperty("列") - private Integer column; + private Integer columnNum; @Schema(description = "层") @ExcelProperty("层") - private Integer layer; + private Integer layerNum; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationSaveReqVO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationSaveReqVO.java index f25295e5..80f805fe 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationSaveReqVO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/depotlocation/vo/DepotLocationSaveReqVO.java @@ -23,13 +23,13 @@ public class DepotLocationSaveReqVO { private Long depotAreaId; @Schema(description = "行") - private Integer row; + private Integer rowNum; @Schema(description = "列") - private Integer column; + private Integer columnNum; @Schema(description = "层") - private Integer layer; + private Integer layerNum; @Schema(description = "子表列表", example = "1") private List items; diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depot/DepotDO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depot/DepotDO.java index c4030a69..a5defd9c 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depot/DepotDO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depot/DepotDO.java @@ -1,11 +1,11 @@ package cn.iocoder.yudao.module.wms.dal.dataobject.depot; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 仓库管理 DO @@ -48,4 +48,21 @@ public class DepotDO extends BaseDO { */ private String phone; -} \ No newline at end of file + /** + * 仓库状态 0禁用 1启用 + */ + private Integer status; + + /** + * 备注 + */ + private String remark; + + /** + * 工厂名称 + */ + @TableField(exist = false) + private String factoryName; + + +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotarea/DepotAreaDO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotarea/DepotAreaDO.java index 39295d44..fa7e2640 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotarea/DepotAreaDO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotarea/DepotAreaDO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.wms.dal.dataobject.depotarea; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -39,6 +41,12 @@ public class DepotAreaDO extends BaseDO { * 库区名称 */ private String depotAreaName; + + /** + * 库区编号 + */ + private String depotAreaNo; + /** * 库区类别 1产品仓 2废料仓（报损） */ @@ -52,4 +60,9 @@ public class DepotAreaDO extends BaseDO { */ private String remark; -} \ No newline at end of file + /** + * 工厂名称 + */ + @TableField(exist = false) + private String factoryName; +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotlocation/DepotLocationDO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotlocation/DepotLocationDO.java index 9b5adbd9..d3dd8c14 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotlocation/DepotLocationDO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotlocation/DepotLocationDO.java @@ -43,15 +43,15 @@ public class DepotLocationDO extends BaseDO { /** * 行 */ - private Integer row; + private Integer rowNum; /** * 列 */ - private Integer column; + private Integer columnNum; /** * 层 */ - private Integer layer; + private Integer layerNum; /** * 子表列表 */ diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotlocationitem/DepotLocationItemDO.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotlocationitem/DepotLocationItemDO.java index 134fc0f8..525f6de6 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotlocationitem/DepotLocationItemDO.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/depotlocationitem/DepotLocationItemDO.java @@ -47,18 +47,22 @@ public class DepotLocationItemDO extends BaseDO { /** * 上边框json{routeCheck: true,type:"top"} */ + @TableField("`top`") private String top; /** * 下边框json{routeCheck: true,type:"bottom"} */ + @TableField("`bottom`") private String bottom; /** * 左边框json{routeCheck: true,type:"left"} */ + @TableField("`left`") private String left; /** * 右边框json{routeCheck: true,type:"right"} */ + @TableField("`right`") private String right; /** * 下标（1,2） diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depot/DepotMapper.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depot/DepotMapper.java index 4c1e714a..052f515c 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depot/DepotMapper.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depot/DepotMapper.java @@ -1,13 +1,14 @@ package cn.iocoder.yudao.module.wms.dal.mysql.depot; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotPageReqVO; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotRespVO; import cn.iocoder.yudao.module.wms.dal.dataobject.depot.DepotDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.*; + +import java.util.List; /** * 仓库管理 Mapper @@ -28,4 +29,5 @@ public interface DepotMapper extends BaseMapperX { .orderByDesc(DepotDO::getId)); } -} \ No newline at end of file + List selectAllList(DepotPageReqVO reqVO); +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depotarea/DepotAreaMapper.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depotarea/DepotAreaMapper.java index 3744727e..784456ee 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depotarea/DepotAreaMapper.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depotarea/DepotAreaMapper.java @@ -5,6 +5,8 @@ import java.util.*; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotPageReqVO; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotRespVO; import cn.iocoder.yudao.module.wms.dal.dataobject.depotarea.DepotAreaDO; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.*; @@ -29,4 +31,5 @@ public interface DepotAreaMapper extends BaseMapperX { .orderByDesc(DepotAreaDO::getId)); } -} \ No newline at end of file + List getDepotAreaAllList(DepotAreaPageReqVO pageReqVO); +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depotlocation/DepotLocationMapper.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depotlocation/DepotLocationMapper.java index f93c7bbf..95c83b53 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depotlocation/DepotLocationMapper.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/depotlocation/DepotLocationMapper.java @@ -22,11 +22,11 @@ public interface DepotLocationMapper extends BaseMapperX { .eqIfPresent(DepotLocationDO::getFactoryId, reqVO.getFactoryId()) .eqIfPresent(DepotLocationDO::getDepotId, reqVO.getDepotId()) .eqIfPresent(DepotLocationDO::getDepotAreaId, reqVO.getDepotAreaId()) - .eqIfPresent(DepotLocationDO::getRow, reqVO.getRow()) - .eqIfPresent(DepotLocationDO::getColumn, reqVO.getColumn()) - .eqIfPresent(DepotLocationDO::getLayer, reqVO.getLayer()) + .eqIfPresent(DepotLocationDO::getRowNum, reqVO.getRowNum()) + .eqIfPresent(DepotLocationDO::getColumnNum, reqVO.getColumnNum()) + .eqIfPresent(DepotLocationDO::getLayerNum, reqVO.getLayerNum()) .betweenIfPresent(DepotLocationDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(DepotLocationDO::getId)); } -} \ No newline at end of file +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/framework/rpc/config/RpcConfiguration.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/framework/rpc/config/RpcConfiguration.java index 034d8457..fa80f6e1 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/framework/rpc/config/RpcConfiguration.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/framework/rpc/config/RpcConfiguration.java @@ -1,14 +1,10 @@ package cn.iocoder.yudao.module.wms.framework.rpc.config; -import cn.iocoder.yudao.module.system.api.dept.DeptApi; -import cn.iocoder.yudao.module.system.api.dept.PostApi; -import cn.iocoder.yudao.module.system.api.equipment.AttendanceMachineApi; -import cn.iocoder.yudao.module.system.api.social.SocialClientApi; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.smartfactory.api.factoryInfo.FactoryInfoApi; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) -@EnableFeignClients(clients = { }) +@EnableFeignClients(clients = {FactoryInfoApi.class}) public class RpcConfiguration { } diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depot/DepotService.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depot/DepotService.java index bfd6302f..dc769ebe 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depot/DepotService.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depot/DepotService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.wms.service.depot; -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.*; -import cn.iocoder.yudao.module.wms.dal.dataobject.depot.DepotDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotPageReqVO; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotRespVO; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotSaveReqVO; +import cn.iocoder.yudao.module.wms.dal.dataobject.depot.DepotDO; + +import javax.validation.Valid; +import java.util.List; /** * 仓库管理 Service 接口 @@ -52,4 +54,11 @@ public interface DepotService { */ PageResult getDepotPage(DepotPageReqVO pageReqVO); -} \ No newline at end of file + /** + * 获得仓库管理 + * + * @param pageReqVO + * @return + */ + List getDepotList(DepotPageReqVO pageReqVO); +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depot/DepotServiceImpl.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depot/DepotServiceImpl.java index 127c0b5d..41047b5f 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depot/DepotServiceImpl.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depot/DepotServiceImpl.java @@ -1,21 +1,22 @@ package cn.iocoder.yudao.module.wms.service.depot; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.*; -import cn.iocoder.yudao.module.wms.dal.dataobject.depot.DepotDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.smartfactory.api.factoryInfo.FactoryInfoApi; +import cn.iocoder.yudao.module.smartfactory.api.factoryInfo.dto.FactoryInfoDTO; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotPageReqVO; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotRespVO; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotSaveReqVO; +import cn.iocoder.yudao.module.wms.dal.dataobject.depot.DepotDO; import cn.iocoder.yudao.module.wms.dal.mysql.depot.DepotMapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*; +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 仓库管理 Service 实现类 @@ -28,11 +29,14 @@ public class DepotServiceImpl implements DepotService { @Resource private DepotMapper depotMapper; + @Resource + private FactoryInfoApi factoryInfoApi; @Override public Long createDepot(DepotSaveReqVO createReqVO) { // 插入 DepotDO depot = BeanUtils.toBean(createReqVO, DepotDO.class); + depot.setDepotNo(IdWorker.get32UUID()); depotMapper.insert(depot); // 返回 return depot.getId(); @@ -58,7 +62,20 @@ public class DepotServiceImpl implements DepotService { @Override public PageResult getDepotPage(DepotPageReqVO pageReqVO) { - return depotMapper.selectPage(pageReqVO); + PageResult depotDOPageResult = depotMapper.selectPage(pageReqVO); + List factoryIds = depotDOPageResult.getList().stream().map(DepotDO::getFactoryId).collect(Collectors.toList()); + //获取工厂列表名称 + List factoryInfoList = factoryInfoApi.getFactoryInfoList(factoryIds).getCheckedData(); + Map map = factoryInfoList.stream().collect(Collectors.toMap(FactoryInfoDTO::getId, FactoryInfoDTO::getName)); + for (DepotDO depotDO : depotDOPageResult.getList()) { + depotDO.setFactoryName(map.get(depotDO.getFactoryId())); + } + return depotDOPageResult; + } + + @Override + public List getDepotList(DepotPageReqVO pageReqVO) { + return depotMapper.selectAllList(pageReqVO); } } diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotarea/DepotAreaService.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotarea/DepotAreaService.java index dde94930..73251191 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotarea/DepotAreaService.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotarea/DepotAreaService.java @@ -1,11 +1,15 @@ package cn.iocoder.yudao.module.wms.service.depotarea; -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.*; -import cn.iocoder.yudao.module.wms.dal.dataobject.depotarea.DepotAreaDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotPageReqVO; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotRespVO; +import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.DepotAreaPageReqVO; +import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.DepotAreaRespVO; +import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.DepotAreaSaveReqVO; +import cn.iocoder.yudao.module.wms.dal.dataobject.depotarea.DepotAreaDO; + +import javax.validation.Valid; +import java.util.List; /** * 库区管理 Service 接口 @@ -52,4 +56,11 @@ public interface DepotAreaService { */ PageResult getDepotAreaPage(DepotAreaPageReqVO pageReqVO); -} \ No newline at end of file + /** + * 获得库区管理列表 + * + * @param pageReqVO + * @return + */ + List getDepotAreaList(DepotAreaPageReqVO pageReqVO); +} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotarea/DepotAreaServiceImpl.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotarea/DepotAreaServiceImpl.java index 22692440..e5491dee 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotarea/DepotAreaServiceImpl.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotarea/DepotAreaServiceImpl.java @@ -1,21 +1,23 @@ package cn.iocoder.yudao.module.wms.service.depotarea; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.*; -import cn.iocoder.yudao.module.wms.dal.dataobject.depotarea.DepotAreaDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.smartfactory.api.factoryInfo.FactoryInfoApi; +import cn.iocoder.yudao.module.smartfactory.api.factoryInfo.dto.FactoryInfoDTO; +import cn.iocoder.yudao.module.wms.controller.admin.depot.vo.DepotRespVO; +import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.DepotAreaPageReqVO; +import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.DepotAreaRespVO; +import cn.iocoder.yudao.module.wms.controller.admin.depotarea.vo.DepotAreaSaveReqVO; +import cn.iocoder.yudao.module.wms.dal.dataobject.depotarea.DepotAreaDO; import cn.iocoder.yudao.module.wms.dal.mysql.depotarea.DepotAreaMapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*; +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 库区管理 Service 实现类 @@ -28,11 +30,14 @@ public class DepotAreaServiceImpl implements DepotAreaService { @Resource private DepotAreaMapper depotAreaMapper; + @Resource + private FactoryInfoApi factoryInfoApi; @Override public Long createDepotArea(DepotAreaSaveReqVO createReqVO) { // 插入 DepotAreaDO depotArea = BeanUtils.toBean(createReqVO, DepotAreaDO.class); + depotArea.setDepotAreaNo(IdWorker.get32UUID()); depotAreaMapper.insert(depotArea); // 返回 return depotArea.getId(); @@ -58,7 +63,20 @@ public class DepotAreaServiceImpl implements DepotAreaService { @Override public PageResult getDepotAreaPage(DepotAreaPageReqVO pageReqVO) { - return depotAreaMapper.selectPage(pageReqVO); + PageResult depotAreaDOPageResult = depotAreaMapper.selectPage(pageReqVO); + List factoryIds = depotAreaDOPageResult.getList().stream().map(DepotAreaDO::getFactoryId).collect(Collectors.toList()); + //获取工厂列表名称 + List factoryInfoList = factoryInfoApi.getFactoryInfoList(factoryIds).getCheckedData(); + Map map = factoryInfoList.stream().collect(Collectors.toMap(FactoryInfoDTO::getId, FactoryInfoDTO::getName)); + for (DepotAreaDO depotAreaDO : depotAreaDOPageResult.getList()) { + depotAreaDO.setFactoryName(map.get(depotAreaDO.getFactoryId())); + } + return depotAreaDOPageResult; + } + + @Override + public List getDepotAreaList(DepotAreaPageReqVO pageReqVO) { + return depotAreaMapper.getDepotAreaAllList(pageReqVO); } } diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/resources/mapper/depot/DepotMapper.xml b/yudao-module-wms/yudao-module-wms-biz/src/main/resources/mapper/depot/DepotMapper.xml index 3bfd3ea1..eb1013d7 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/resources/mapper/depot/DepotMapper.xml +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/resources/mapper/depot/DepotMapper.xml @@ -9,4 +9,20 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - \ No newline at end of file + + diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/resources/mapper/depotarea/DepotAreaMapper.xml b/yudao-module-wms/yudao-module-wms-biz/src/main/resources/mapper/depotarea/DepotAreaMapper.xml index 759f2ed8..313b154a 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/resources/mapper/depotarea/DepotAreaMapper.xml +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/resources/mapper/depotarea/DepotAreaMapper.xml @@ -9,4 +9,27 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - \ No newline at end of file + +