From b4bc37554b6f36e1fb8db30aafe73e382bab3a54 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 16 Feb 2026 12:11:51 +0800 Subject: [PATCH] refactor(mes): 修正工作站模块中文注释命名 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigRespVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigSaveReqVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/package-info.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java | 47 ++++++++++++++++++++++------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationController.java | 66 +++++++++++++++++++++++++++++++----------------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationMachineController.java | 14 +++++++------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationToolController.java | 12 ++++++------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java | 42 ++++++++++++++++++++++++++++++++---------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineRespVO.java | 36 ------------------------------------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineSaveReqVO.java | 28 ---------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationPageReqVO.java | 6 +++--- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationRespVO.java | 18 +++++++++--------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java | 14 +++++++------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineRespVO.java | 36 ++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineSaveReqVO.java | 28 ++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolRespVO.java | 4 ++-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolSaveReqVO.java | 6 +++--- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerRespVO.java | 4 ++-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerSaveReqVO.java | 6 +++--- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/item/MesMdItemBatchConfigDO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkshopDO.java | 12 ++++++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationDO.java | 34 +++++++++++++++++++++++----------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationMachineDO.java | 11 +++++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationToolDO.java | 11 +++++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationWorkerDO.java | 13 ++++++++----- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMachineMapper.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMapper.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationToolMapper.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationWorkerMapper.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 34 +++++++++++++++++----------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopService.java | 36 +++++++++++++++++++++++++++++++++++- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopServiceImpl.java | 14 +++++++------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineService.java | 23 +++++++++++++++++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java | 6 +++--- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationService.java | 38 +++++++++++++++++++++++++++++++++++--- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java | 18 +++++++++--------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolService.java | 25 +++++++++++++++++++++++-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolServiceImpl.java | 19 ++++++++++--------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerService.java | 26 +++++++++++++++++++++++--- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java | 22 ++++++++++++---------- 40 files changed, 445 insertions(+), 280 deletions(-) delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineRespVO.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineSaveReqVO.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigRespVO.java index a9ea46e..accb2a1 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigRespVO.java @@ -42,7 +42,7 @@ public class MesMdItemBatchConfigRespVO { @Schema(description = "批次属性-生产任务", example = "false") private Boolean taskFlag; - @Schema(description = "批次属性-工位", example = "false") + @Schema(description = "批次属性-工作站", example = "false") private Boolean workstationFlag; @Schema(description = "批次属性-工具", example = "false") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigSaveReqVO.java index e5c620b..0d6130e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/batchconfig/MesMdItemBatchConfigSaveReqVO.java @@ -42,7 +42,7 @@ public class MesMdItemBatchConfigSaveReqVO { @Schema(description = "批次属性-生产任务", example = "false") private Boolean taskFlag; - @Schema(description = "批次属性-工位", example = "false") + @Schema(description = "批次属性-工作站", example = "false") private Boolean workstationFlag; @Schema(description = "批次属性-工具", example = "false") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/package-info.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/package-info.java index b8efe9a..0050024 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/package-info.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/package-info.java @@ -1,4 +1,4 @@ /** - * MES 基础数据（Master Data）：物料、物料分类、计量单位、客户、供应商、车间、工位、BOM、SOP、SIP 等制造基础主数据 + * MES 基础数据（Master Data）：物料、物料分类、计量单位、客户、供应商、车间、工作站、BOM、SOP、SIP 等制造基础主数据 */ package cn.iocoder.yudao.module.mes.controller.admin.md; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java index f173a0b..a877b9e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.mes.controller.admin.md.workstation; +import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 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.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.workshop.MesMdWorkshopPageReqVO; @@ -25,14 +27,13 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.IOException; +import java.util.Collections; import java.util.List; import java.util.Map; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; @Tag(name = "管理后台 - MES 车间") @RestController @@ -76,14 +77,7 @@ public class MesMdWorkshopController { @PreAuthorize("@ss.hasPermission('mes:md-workshop:query')") public CommonResult getWorkshop(@RequestParam("id") Long id) { MesMdWorkshopDO workshop = workshopService.getWorkshop(id); - MesMdWorkshopRespVO respVO = BeanUtils.toBean(workshop, MesMdWorkshopRespVO.class); - if (respVO != null && respVO.getChargeUserId() != null) { - AdminUserRespDTO user = adminUserApi.getUser(respVO.getChargeUserId()); - if (user != null) { - respVO.setChargeUserName(user.getNickname()); - } - } - return success(respVO); + return success(BeanUtils.toBean(workshop, MesMdWorkshopRespVO.class)); } @GetMapping("/page") @@ -91,13 +85,7 @@ public class MesMdWorkshopController { @PreAuthorize("@ss.hasPermission('mes:md-workshop:query')") public CommonResult> getWorkshopPage(@Valid MesMdWorkshopPageReqVO pageReqVO) { PageResult pageResult = workshopService.getWorkshopPage(pageReqVO); - PageResult voPageResult = BeanUtils.toBean(pageResult, MesMdWorkshopRespVO.class); - // 拼装负责人名称 - Map userMap = adminUserApi.getUserMap( - convertSet(voPageResult.getList(), MesMdWorkshopRespVO::getChargeUserId)); - voPageResult.getList().forEach(vo -> findAndThen(userMap, vo.getChargeUserId(), - user -> vo.setChargeUserName(user.getNickname()))); - return success(voPageResult); + return success(new PageResult<>(buildWorkshopRespVOList(pageResult.getList()), pageResult.getTotal())); } @GetMapping("/simple-list") @@ -116,15 +104,24 @@ public class MesMdWorkshopController { HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = workshopService.getWorkshopPage(pageReqVO).getList(); - // 拼装负责人名称 - List voList = BeanUtils.toBean(list, MesMdWorkshopRespVO.class); - Map userMap = adminUserApi.getUserMap( - convertSet(voList, MesMdWorkshopRespVO::getChargeUserId)); - voList.forEach(vo -> findAndThen(userMap, vo.getChargeUserId(), - user -> vo.setChargeUserName(user.getNickname()))); + List voList = buildWorkshopRespVOList(list); ExcelUtils.write(response, "车间.xls", "数据", MesMdWorkshopRespVO.class, voList); } - // TODO @AI：是不是要搞个方法，类似 private List buildProductBomRespVOList(List list) { + // ==================== 拼接 VO ==================== + + private List buildWorkshopRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 批量获取负责人信息 + Map userMap = adminUserApi.getUserMap( + convertSet(list, MesMdWorkshopDO::getChargeUserId)); + // 2. 拼接 VO + return BeanUtils.toBean(list, MesMdWorkshopRespVO.class, vo -> { + MapUtils.findAndThen(userMap, vo.getChargeUserId(), + user -> vo.setChargeUserName(user.getNickname())); + }); + } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationController.java index ad75141..9cf1a89 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationController.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.mes.controller.admin.md.workstation; +import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 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.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationPageReqVO; @@ -25,16 +27,15 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.IOException; +import java.util.Collections; import java.util.List; import java.util.Map; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; -@Tag(name = "管理后台 - MES 工位") +@Tag(name = "管理后台 - MES 工作站") @RestController @RequestMapping("/mes/md-workstation") @Validated @@ -47,14 +48,14 @@ public class MesMdWorkstationController { private MesMdWorkshopService workshopService; @PostMapping("/create") - @Operation(summary = "创建工位") + @Operation(summary = "创建工作站") @PreAuthorize("@ss.hasPermission('mes:md-workstation:create')") public CommonResult createWorkstation(@Valid @RequestBody MesMdWorkstationSaveReqVO createReqVO) { return success(workstationService.createWorkstation(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新工位") + @Operation(summary = "更新工作站") @PreAuthorize("@ss.hasPermission('mes:md-workstation:update')") public CommonResult updateWorkstation(@Valid @RequestBody MesMdWorkstationSaveReqVO updateReqVO) { workstationService.updateWorkstation(updateReqVO); @@ -62,7 +63,7 @@ public class MesMdWorkstationController { } @DeleteMapping("/delete") - @Operation(summary = "删除工位") + @Operation(summary = "删除工作站") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('mes:md-workstation:delete')") public CommonResult deleteWorkstation(@RequestParam("id") Long id) { @@ -71,38 +72,24 @@ public class MesMdWorkstationController { } @GetMapping("/get") - @Operation(summary = "获得工位") + @Operation(summary = "获得工作站") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('mes:md-workstation:query')") public CommonResult getWorkstation(@RequestParam("id") Long id) { MesMdWorkstationDO workstation = workstationService.getWorkstation(id); - MesMdWorkstationRespVO respVO = BeanUtils.toBean(workstation, MesMdWorkstationRespVO.class); - if (respVO != null && respVO.getWorkshopId() != null) { - MesMdWorkshopDO workshop = workshopService.getWorkshop(respVO.getWorkshopId()); - if (workshop != null) { - respVO.setWorkshopName(workshop.getName()); - } - } - return success(respVO); + return success(BeanUtils.toBean(workstation, MesMdWorkstationRespVO.class)); } @GetMapping("/page") - @Operation(summary = "获得工位分页") + @Operation(summary = "获得工作站分页") @PreAuthorize("@ss.hasPermission('mes:md-workstation:query')") public CommonResult> getWorkstationPage(@Valid MesMdWorkstationPageReqVO pageReqVO) { PageResult pageResult = workstationService.getWorkstationPage(pageReqVO); - PageResult voPageResult = BeanUtils.toBean(pageResult, MesMdWorkstationRespVO.class); - // 拼装车间名称 - Map workshopMap = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap( - workshopService.getWorkshopListByStatus(null), - MesMdWorkshopDO::getId); - voPageResult.getList().forEach(vo -> findAndThen(workshopMap, vo.getWorkshopId(), - workshop -> vo.setWorkshopName(workshop.getName()))); - return success(voPageResult); + return success(new PageResult<>(buildWorkstationRespVOList(pageResult.getList()), pageResult.getTotal())); } @GetMapping("/simple-list") - @Operation(summary = "获得工位精简列表", description = "只包含被开启的工位，主要用于前端的下拉选项") + @Operation(summary = "获得工作站精简列表", description = "只包含被开启的工作站，主要用于前端的下拉选项") public CommonResult> getWorkstationSimpleList() { List list = workstationService.getWorkstationListByStatus(CommonStatusEnum.ENABLE.getStatus()); return success(convertList(list, ws -> new MesMdWorkstationRespVO() @@ -110,23 +97,32 @@ public class MesMdWorkstationController { } @GetMapping("/export-excel") - @Operation(summary = "导出工位 Excel") + @Operation(summary = "导出工作站 Excel") @PreAuthorize("@ss.hasPermission('mes:md-workstation:export')") @ApiAccessLog(operateType = EXPORT) public void exportWorkstationExcel(@Valid MesMdWorkstationPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = workstationService.getWorkstationPage(pageReqVO).getList(); - // 拼装车间名称 - List voList = BeanUtils.toBean(list, MesMdWorkstationRespVO.class); - Map workshopMap = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap( + List voList = buildWorkstationRespVOList(list); + ExcelUtils.write(response, "工作站.xls", "数据", MesMdWorkstationRespVO.class, voList); + } + + // ==================== 拼接 VO ==================== + + private List buildWorkstationRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 批量获取车间信息 + Map workshopMap = convertMap( workshopService.getWorkshopListByStatus(null), MesMdWorkshopDO::getId); - voList.forEach(vo -> findAndThen(workshopMap, vo.getWorkshopId(), - workshop -> vo.setWorkshopName(workshop.getName()))); - ExcelUtils.write(response, "工位.xls", "数据", MesMdWorkstationRespVO.class, voList); + // 2. 拼接 VO + return BeanUtils.toBean(list, MesMdWorkstationRespVO.class, vo -> { + MapUtils.findAndThen(workshopMap, vo.getWorkshopId(), + workshop -> vo.setWorkshopName(workshop.getName())); + }); } - // TODO @AI：是不是要搞个方法，类似 private List buildProductBomRespVOList(List list) { - } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationMachineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationMachineController.java index 46a3eb5..23b5e6a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationMachineController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationMachineController.java @@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.mes.controller.admin.md.workstation; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationMachineRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationMachineSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.machine.MesMdWorkstationMachineRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.machine.MesMdWorkstationMachineSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationMachineDO; import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationMachineService; import io.swagger.v3.oas.annotations.Operation; @@ -19,7 +19,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - MES 工位设备") +@Tag(name = "管理后台 - MES 设备资源") @RestController @RequestMapping("/mes/md-workstation-machine") @Validated @@ -29,14 +29,14 @@ public class MesMdWorkstationMachineController { private MesMdWorkstationMachineService workstationMachineService; @PostMapping("/create") - @Operation(summary = "创建工位设备") + @Operation(summary = "创建设备资源") @PreAuthorize("@ss.hasPermission('mes:md-workstation:update')") public CommonResult createWorkstationMachine(@Valid @RequestBody MesMdWorkstationMachineSaveReqVO createReqVO) { return success(workstationMachineService.createWorkstationMachine(createReqVO)); } @DeleteMapping("/delete") - @Operation(summary = "删除工位设备") + @Operation(summary = "删除设备资源") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('mes:md-workstation:update')") public CommonResult deleteWorkstationMachine(@RequestParam("id") Long id) { @@ -45,8 +45,8 @@ public class MesMdWorkstationMachineController { } @GetMapping("/list-by-workstation") - @Operation(summary = "获得工位设备列表") - @Parameter(name = "workstationId", description = "工位编号", required = true) + @Operation(summary = "获得设备资源列表") + @Parameter(name = "workstationId", description = "工作站编号", required = true) @PreAuthorize("@ss.hasPermission('mes:md-workstation:query')") public CommonResult> getWorkstationMachineList( @RequestParam("workstationId") Long workstationId) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationToolController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationToolController.java index 6208c08..8dbacfa 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationToolController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationToolController.java @@ -19,7 +19,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - MES 工位工具") +@Tag(name = "管理后台 - MES 工装夹具资源") @RestController @RequestMapping("/mes/md-workstation-tool") @Validated @@ -29,14 +29,14 @@ public class MesMdWorkstationToolController { private MesMdWorkstationToolService workstationToolService; @PostMapping("/create") - @Operation(summary = "创建工位工具") + @Operation(summary = "创建工装夹具资源") @PreAuthorize("@ss.hasPermission('mes:md-workstation:update')") public CommonResult createWorkstationTool(@Valid @RequestBody MesMdWorkstationToolSaveReqVO createReqVO) { return success(workstationToolService.createWorkstationTool(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新工位工具") + @Operation(summary = "更新工装夹具资源") @PreAuthorize("@ss.hasPermission('mes:md-workstation:update')") public CommonResult updateWorkstationTool(@Valid @RequestBody MesMdWorkstationToolSaveReqVO updateReqVO) { workstationToolService.updateWorkstationTool(updateReqVO); @@ -44,7 +44,7 @@ public class MesMdWorkstationToolController { } @DeleteMapping("/delete") - @Operation(summary = "删除工位工具") + @Operation(summary = "删除工装夹具资源") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('mes:md-workstation:update')") public CommonResult deleteWorkstationTool(@RequestParam("id") Long id) { @@ -53,8 +53,8 @@ public class MesMdWorkstationToolController { } @GetMapping("/list-by-workstation") - @Operation(summary = "获得工位工具列表") - @Parameter(name = "workstationId", description = "工位编号", required = true) + @Operation(summary = "获得工装夹具资源列表") + @Parameter(name = "workstationId", description = "工作站编号", required = true) @PreAuthorize("@ss.hasPermission('mes:md-workstation:query')") public CommonResult> getWorkstationToolList( @RequestParam("workstationId") Long workstationId) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java index 0fcd4f0..2bf066d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java @@ -1,11 +1,15 @@ package cn.iocoder.yudao.module.mes.controller.admin.md.workstation; +import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.worker.MesMdWorkstationWorkerRespVO; import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.worker.MesMdWorkstationWorkerSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationWorkerDO; import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationWorkerService; +import cn.iocoder.yudao.module.system.api.dept.PostApi; +import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -15,11 +19,14 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Collections; import java.util.List; +import java.util.Map; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -@Tag(name = "管理后台 - MES 工位人员") +@Tag(name = "管理后台 - MES 人力资源") @RestController @RequestMapping("/mes/md-workstation-worker") @Validated @@ -28,15 +35,18 @@ public class MesMdWorkstationWorkerController { @Resource private MesMdWorkstationWorkerService workstationWorkerService; + @Resource + private PostApi postApi; + @PostMapping("/create") - @Operation(summary = "创建工位人员") + @Operation(summary = "创建人力资源") @PreAuthorize("@ss.hasPermission('mes:md-workstation:update')") public CommonResult createWorkstationWorker(@Valid @RequestBody MesMdWorkstationWorkerSaveReqVO createReqVO) { return success(workstationWorkerService.createWorkstationWorker(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新工位人员") + @Operation(summary = "更新人力资源") @PreAuthorize("@ss.hasPermission('mes:md-workstation:update')") public CommonResult updateWorkstationWorker(@Valid @RequestBody MesMdWorkstationWorkerSaveReqVO updateReqVO) { workstationWorkerService.updateWorkstationWorker(updateReqVO); @@ -44,7 +54,7 @@ public class MesMdWorkstationWorkerController { } @DeleteMapping("/delete") - @Operation(summary = "删除工位人员") + @Operation(summary = "删除人力资源") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('mes:md-workstation:update')") public CommonResult deleteWorkstationWorker(@RequestParam("id") Long id) { @@ -53,17 +63,29 @@ public class MesMdWorkstationWorkerController { } @GetMapping("/list-by-workstation") - @Operation(summary = "获得工位人员列表") - @Parameter(name = "workstationId", description = "工位编号", required = true) + @Operation(summary = "获得人力资源列表") + @Parameter(name = "workstationId", description = "工作站编号", required = true) @PreAuthorize("@ss.hasPermission('mes:md-workstation:query')") public CommonResult> getWorkstationWorkerList( @RequestParam("workstationId") Long workstationId) { List list = workstationWorkerService.getWorkstationWorkerListByWorkstationId(workstationId); - // TODO @芋艿：拼装岗位名称，等前端从 system_post 获取岗位下拉列表 - // TODO @AI：后端拼接下返回；postApi？ - return success(BeanUtils.toBean(list, MesMdWorkstationWorkerRespVO.class)); + return success(buildWorkstationWorkerRespVOList(list)); } - // TODO @AI：是不是要搞个方法，类似 private List buildProductBomRespVOList(List list) { + // ==================== 拼接 VO ==================== + + private List buildWorkstationWorkerRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 批量获取岗位信息 + Map postMap = postApi.getPostMap( + convertSet(list, MesMdWorkstationWorkerDO::getPostId)); + // 2. 拼接 VO + return BeanUtils.toBean(list, MesMdWorkstationWorkerRespVO.class, vo -> { + MapUtils.findAndThen(postMap, vo.getPostId(), + post -> vo.setPostName(post.getName())); + }); + } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineRespVO.java deleted file mode 100644 index 91e5f88..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineRespVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - MES 工位设备 Response VO") -@Data -public class MesMdWorkstationMachineRespVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - private Long id; - - @Schema(description = "工位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long workstationId; - - @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long machineryId; - - @Schema(description = "设备编码", example = "M001") - private String machineryCode; - - @Schema(description = "设备名称", example = "CNC数控机床") - private String machineryName; - - @Schema(description = "数量", example = "1") - private Integer quantity; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - private LocalDateTime createTime; - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineSaveReqVO.java deleted file mode 100644 index e458e7d..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationMachineSaveReqVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Schema(description = "管理后台 - MES 工位设备新增 Request VO") -@Data -public class MesMdWorkstationMachineSaveReqVO { - - @Schema(description = "编号", example = "1024") - private Long id; - - @Schema(description = "工位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "工位不能为空") - private Long workstationId; - - @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "设备不能为空") - private Long machineryId; - - @Schema(description = "数量", example = "1") - private Integer quantity; - - @Schema(description = "备注") - private String remark; - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationPageReqVO.java index 6f82988..7465262 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationPageReqVO.java @@ -6,16 +6,16 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - MES 工位分页 Request VO") +@Schema(description = "管理后台 - MES 工作站分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class MesMdWorkstationPageReqVO extends PageParam { - @Schema(description = "工位编码", example = "WK001") + @Schema(description = "工作站编码", example = "WK001") private String code; - @Schema(description = "工位名称", example = "一号工位") + @Schema(description = "工作站名称", example = "一号工作站") private String name; @Schema(description = "所在车间编号", example = "1") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationRespVO.java index 63b76ab..6c92b12 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationRespVO.java @@ -7,25 +7,25 @@ import lombok.Data; import java.time.LocalDateTime; -@Schema(description = "管理后台 - MES 工位 Response VO") +@Schema(description = "管理后台 - MES 工作站 Response VO") @Data @ExcelIgnoreUnannotated public class MesMdWorkstationRespVO { - @Schema(description = "工位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - @ExcelProperty("工位编号") + @Schema(description = "工作站编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("工作站编号") private Long id; - @Schema(description = "工位编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "WK001") - @ExcelProperty("工位编码") + @Schema(description = "工作站编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "WK001") + @ExcelProperty("工作站编码") private String code; - @Schema(description = "工位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "一号工位") - @ExcelProperty("工位名称") + @Schema(description = "工作站名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "一号工作站") + @ExcelProperty("工作站名称") private String name; - @Schema(description = "工位地点", example = "A区1号线") - @ExcelProperty("工位地点") + @Schema(description = "工作站地点", example = "A区1号线") + @ExcelProperty("工作站地点") private String address; @Schema(description = "所在车间编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java index 2ea6867..79bd7d5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java @@ -5,22 +5,22 @@ import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; -@Schema(description = "管理后台 - MES 工位新增/修改 Request VO") +@Schema(description = "管理后台 - MES 工作站新增/修改 Request VO") @Data public class MesMdWorkstationSaveReqVO { - @Schema(description = "工位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @Schema(description = "工作站编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "工位编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "WK001") - @NotEmpty(message = "工位编码不能为空") + @Schema(description = "工作站编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "WK001") + @NotEmpty(message = "工作站编码不能为空") private String code; - @Schema(description = "工位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "一号工位") - @NotEmpty(message = "工位名称不能为空") + @Schema(description = "工作站名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "一号工作站") + @NotEmpty(message = "工作站名称不能为空") private String name; - @Schema(description = "工位地点", example = "A区1号线") + @Schema(description = "工作站地点", example = "A区1号线") private String address; @Schema(description = "所在车间编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineRespVO.java new file mode 100644 index 0000000..f4ac4f5 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineRespVO.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.machine; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 设备资源 Response VO") +@Data +public class MesMdWorkstationMachineRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "工作站编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long workstationId; + + @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long machineryId; + + @Schema(description = "设备编码", example = "M001") + private String machineryCode; + + @Schema(description = "设备名称", example = "CNC数控机床") + private String machineryName; + + @Schema(description = "数量", example = "1") + private Integer quantity; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineSaveReqVO.java new file mode 100644 index 0000000..94203c1 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/machine/MesMdWorkstationMachineSaveReqVO.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.machine; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 设备资源新增 Request VO") +@Data +public class MesMdWorkstationMachineSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "工作站编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "工作站不能为空") + private Long workstationId; + + @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "设备不能为空") + private Long machineryId; + + @Schema(description = "数量", example = "1") + private Integer quantity; + + @Schema(description = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolRespVO.java index bee1f6a..e4dbf57 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolRespVO.java @@ -5,14 +5,14 @@ import lombok.Data; import java.time.LocalDateTime; -@Schema(description = "管理后台 - MES 工位工具 Response VO") +@Schema(description = "管理后台 - MES 工装夹具资源 Response VO") @Data public class MesMdWorkstationToolRespVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "工位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "工作站编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long workstationId; @Schema(description = "工具类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolSaveReqVO.java index 5e507c1..15f60a0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/tool/MesMdWorkstationToolSaveReqVO.java @@ -4,15 +4,15 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; -@Schema(description = "管理后台 - MES 工位工具新增/修改 Request VO") +@Schema(description = "管理后台 - MES 工装夹具资源新增/修改 Request VO") @Data public class MesMdWorkstationToolSaveReqVO { @Schema(description = "编号", example = "1024") private Long id; - @Schema(description = "工位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "工位不能为空") + @Schema(description = "工作站编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "工作站不能为空") private Long workstationId; @Schema(description = "工具类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerRespVO.java index bf6c7f4..31340d3 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerRespVO.java @@ -5,14 +5,14 @@ import lombok.Data; import java.time.LocalDateTime; -@Schema(description = "管理后台 - MES 工位人员 Response VO") +@Schema(description = "管理后台 - MES 人力资源 Response VO") @Data public class MesMdWorkstationWorkerRespVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "工位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "工作站编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long workstationId; @Schema(description = "岗位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerSaveReqVO.java index 92fe47f..89579f8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/worker/MesMdWorkstationWorkerSaveReqVO.java @@ -4,15 +4,15 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; -@Schema(description = "管理后台 - MES 工位人员新增/修改 Request VO") +@Schema(description = "管理后台 - MES 人力资源新增/修改 Request VO") @Data public class MesMdWorkstationWorkerSaveReqVO { @Schema(description = "编号", example = "1024") private Long id; - @Schema(description = "工位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "工位不能为空") + @Schema(description = "工作站编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "工作站不能为空") private Long workstationId; @Schema(description = "岗位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/item/MesMdItemBatchConfigDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/item/MesMdItemBatchConfigDO.java index 95d6074..4ee9b0c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/item/MesMdItemBatchConfigDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/item/MesMdItemBatchConfigDO.java @@ -69,7 +69,7 @@ public class MesMdItemBatchConfigDO extends BaseDO { */ private Boolean taskFlag; /** - * 批次属性-工位 + * 批次属性-工作站 */ private Boolean workstationFlag; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkshopDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkshopDO.java index 091d008..9c5a42e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkshopDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkshopDO.java @@ -40,14 +40,18 @@ public class MesMdWorkshopDO extends BaseDO { * 面积（平方米） */ private BigDecimal area; - // TODO @AI：通过 @ 去关联 + // DONE @AI：通过 @ 去关联 /** - * 负责人用户编号，关联 system_users 表的 id + * 负责人用户编号 + * + * 关联 AdminUserDO 的 id */ private Long chargeUserId; - // TODO @AI：通过 @ 去关联 + // DONE @AI：通过 @ 去关联 /** - * 状态，参见 CommonStatusEnum 枚举 + * 状态 + * + * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum} */ private Integer status; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationDO.java index 9103732..4c8be35 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationDO.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; /** - * MES 工位 DO + * MES 工作站 DO * * @author 芋道源码 */ @@ -27,44 +27,56 @@ public class MesMdWorkstationDO extends BaseDO { @TableId private Long id; /** - * 工位编码 + * 工作站编码 */ private String code; /** - * 工位名称 + * 工作站名称 */ private String name; /** - * 工位地点 + * 工作站地点 */ private String address; - // TODO @AI：通过 @ 去关联，按照别的模块 + // DONE @AI：通过 @ 去关联，按照别的模块 /** - * 所在车间编号，关联 {@link MesMdWorkshopDO#getId()} + * 所在车间编号 + * + * 关联 {@link MesMdWorkshopDO#getId()} */ private Long workshopId; - // TODO @AI：通过 @ 去关联，按照别的模块 + // DONE @AI：通过 @ 去关联，按照别的模块 /** * 工序编号 + * + * TODO @芋艿：等 pro 模块，关联工序表 */ private Long processId; - // TODO @AI：通过 @ 去关联，按照别的模块 + // DONE @AI：通过 @ 去关联，按照别的模块 /** * 线边库编号 + * + * TODO @芋艿：等 wm 模块，关联仓库表 */ private Long warehouseId; - // TODO @AI：通过 @ 去关联，按照别的模块 + // DONE @AI：通过 @ 去关联，按照别的模块 /** * 库区编号 + * + * TODO @芋艿：等 wm 模块，关联库区表 */ private Long locationId; /** * 库位编号 + * + * TODO @芋艿：等 wm 模块，关联库位表 */ private Long areaId; - // TODO @AI：通过 @ 去关联，按照别的模块 + // DONE @AI：通过 @ 去关联，按照别的模块 /** - * 状态，参见 CommonStatusEnum 枚举 + * 状态 + * + * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum} */ private Integer status; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationMachineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationMachineDO.java index 48778da..ead431f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationMachineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationMachineDO.java @@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; +// DONE @AI：设备资源表；已修正所有中文注释 /** - * MES 工位设备 DO + * MES 设备资源 DO * * @author 芋道源码 */ @@ -26,14 +27,16 @@ public class MesMdWorkstationMachineDO extends BaseDO { */ @TableId private Long id; - // TODO @AI：通过 @ 去关联，按照别的模块 /** - * 工位编号，关联 {@link MesMdWorkstationDO#id} + * 工作站编号 + * + * 关联 {@link MesMdWorkstationDO#getId()} */ private Long workstationId; - // TODO @AI：通过 @ 去关联，按照别的模块 /** * 设备编号 + * + * TODO @芋艿：等 dv 模块，关联设备表 */ private Long machineryId; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationToolDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationToolDO.java index 522bfee..dec2142 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationToolDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationToolDO.java @@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; +// DONE @AI：工装夹具资源表；已修正所有中文注释 /** - * MES 工位工具 DO + * MES 工装夹具资源 DO * * @author 芋道源码 */ @@ -26,14 +27,16 @@ public class MesMdWorkstationToolDO extends BaseDO { */ @TableId private Long id; - // TODO @AI：通过 @ 去关联，按照别的模块 /** - * 工位编号，关联 {@link MesMdWorkstationDO#id} + * 工作站编号 + * + * 关联 {@link MesMdWorkstationDO#getId()} */ private Long workstationId; - // TODO @AI：通过 @ 去关联，按照别的模块 /** * 工具类型编号 + * + * TODO @芋艿：等 tm 模块，关联工具类型表 */ private Long toolTypeId; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationWorkerDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationWorkerDO.java index 2dc7c2d..c982184 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationWorkerDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/workstation/MesMdWorkstationWorkerDO.java @@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; +// DONE @AI：人力资源表；已修正所有中文注释 /** - * MES 工位人员 DO + * MES 人力资源 DO * * @author 芋道源码 */ @@ -26,14 +27,16 @@ public class MesMdWorkstationWorkerDO extends BaseDO { */ @TableId private Long id; - // TODO @AI：通过 @ 去关联，按照别的模块 /** - * 工位编号，关联 {@link MesMdWorkstationDO#id} + * 工作站编号 + * + * 关联 {@link MesMdWorkstationDO#getId()} */ private Long workstationId; - // TODO @AI：通过 @ 去关联，按照别的模块 /** - * 岗位编号，关联 system_post 表的 id + * 岗位编号 + * + * 关联 system_post 的 id */ private Long postId; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMachineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMachineMapper.java index 59d3887..1ff2aa3 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMachineMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMachineMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * MES 工位设备 Mapper + * MES 设备资源 Mapper * * @author 芋道源码 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMapper.java index 4b278b5..22c433e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * MES 工位 Mapper + * MES 工作站 Mapper * * @author 芋道源码 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationToolMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationToolMapper.java index d2c42b0..fcb8268 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationToolMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationToolMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * MES 工位工具 Mapper + * MES 工装夹具资源 Mapper * * @author 芋道源码 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationWorkerMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationWorkerMapper.java index 3601b93..0334c1e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationWorkerMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationWorkerMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * MES 工位人员 Mapper + * MES 人力资源 Mapper * * @author 芋道源码 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index 8743a78..b22e484 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -52,21 +52,21 @@ public interface ErrorCodeConstants { ErrorCode MD_WORKSHOP_NOT_EXISTS = new ErrorCode(1_040_105_000, "车间不存在"); ErrorCode MD_WORKSHOP_CODE_DUPLICATE = new ErrorCode(1_040_105_001, "车间编码已存在"); ErrorCode MD_WORKSHOP_NAME_DUPLICATE = new ErrorCode(1_040_105_002, "车间名称已存在"); - ErrorCode MD_WORKSHOP_HAS_WORKSTATION = new ErrorCode(1_040_105_003, "车间下存在工位，无法删除"); - - // ========== MES 基础数据-工位（1-040-106-000） ========== - ErrorCode MD_WORKSTATION_NOT_EXISTS = new ErrorCode(1_040_106_000, "工位不存在"); - ErrorCode MD_WORKSTATION_CODE_DUPLICATE = new ErrorCode(1_040_106_001, "工位编码已存在"); - ErrorCode MD_WORKSTATION_NAME_DUPLICATE = new ErrorCode(1_040_106_002, "工位名称已存在"); - // ========== MES 基础数据-工位设备（1-040-106-100） ========== - ErrorCode MD_WORKSTATION_MACHINE_NOT_EXISTS = new ErrorCode(1_040_106_100, "工位设备记录不存在"); - ErrorCode MD_WORKSTATION_MACHINE_EXISTS = new ErrorCode(1_040_106_101, "该设备已分配到其他工位"); - // ========== MES 基础数据-工位工具（1-040-106-200） ========== - ErrorCode MD_WORKSTATION_TOOL_NOT_EXISTS = new ErrorCode(1_040_106_200, "工位工具记录不存在"); - ErrorCode MD_WORKSTATION_TOOL_TYPE_EXISTS = new ErrorCode(1_040_106_201, "该工具类型已在此工位中存在"); - // ========== MES 基础数据-工位人员（1-040-106-300） ========== - ErrorCode MD_WORKSTATION_WORKER_NOT_EXISTS = new ErrorCode(1_040_106_300, "工位人员记录不存在"); - ErrorCode MD_WORKSTATION_WORKER_POST_EXISTS = new ErrorCode(1_040_106_301, "该岗位已在此工位中存在"); + ErrorCode MD_WORKSHOP_HAS_WORKSTATION = new ErrorCode(1_040_105_003, "车间下存在工作站，无法删除"); + + // ========== MES 基础数据-工作站（1-040-106-000） ========== + ErrorCode MD_WORKSTATION_NOT_EXISTS = new ErrorCode(1_040_106_000, "工作站不存在"); + ErrorCode MD_WORKSTATION_CODE_DUPLICATE = new ErrorCode(1_040_106_001, "工作站编码已存在"); + ErrorCode MD_WORKSTATION_NAME_DUPLICATE = new ErrorCode(1_040_106_002, "工作站名称已存在"); + // ========== MES 基础数据-设备资源（1-040-106-100） ========== + ErrorCode MD_WORKSTATION_MACHINE_NOT_EXISTS = new ErrorCode(1_040_106_100, "设备资源记录不存在"); + ErrorCode MD_WORKSTATION_MACHINE_EXISTS = new ErrorCode(1_040_106_101, "该设备已分配到其他工作站"); + // ========== MES 基础数据-工装夹具资源（1-040-106-200） ========== + ErrorCode MD_WORKSTATION_TOOL_NOT_EXISTS = new ErrorCode(1_040_106_200, "工装夹具资源记录不存在"); + ErrorCode MD_WORKSTATION_TOOL_TYPE_EXISTS = new ErrorCode(1_040_106_201, "该工具类型已在此工作站中存在"); + // ========== MES 基础数据-人力资源（1-040-106-300） ========== + ErrorCode MD_WORKSTATION_WORKER_NOT_EXISTS = new ErrorCode(1_040_106_300, "人力资源记录不存在"); + ErrorCode MD_WORKSTATION_WORKER_POST_EXISTS = new ErrorCode(1_040_106_301, "该岗位已在此工作站中存在"); // ========== MES 基础数据-产品BOM（1-040-107-000） ========== ErrorCode MD_PRODUCT_BOM_NOT_EXISTS = new ErrorCode(1_040_107_000, "产品BOM不存在"); @@ -75,11 +75,11 @@ public interface ErrorCodeConstants { // ========== MES 基础数据-产品SOP（1-040-108-000） ========== ErrorCode MD_PRODUCT_SOP_NOT_EXISTS = new ErrorCode(1_040_108_000, "产品SOP不存在"); - ErrorCode MD_PRODUCT_SOP_ORDER_NUM_DUPLICATE = new ErrorCode(1_040_108_001, "该展示序号已存在"); + ErrorCode MD_PRODUCT_SOP_ORDER_NUMBER_DUPLICATE = new ErrorCode(1_040_108_001, "该展示序号已存在"); // ========== MES 基础数据-产品SIP（1-040-109-000） ========== ErrorCode MD_PRODUCT_SIP_NOT_EXISTS = new ErrorCode(1_040_109_000, "产品SIP不存在"); - ErrorCode MD_PRODUCT_SIP_ORDER_NUM_DUPLICATE = new ErrorCode(1_040_109_001, "该展示序号已存在"); + ErrorCode MD_PRODUCT_SIP_ORDER_NUMBER_DUPLICATE = new ErrorCode(1_040_109_001, "该展示序号已存在"); // ========== MES 日历排班-班次（1-040-200-000） ========== ErrorCode CAL_SHIFT_NOT_EXISTS = new ErrorCode(1_040_200_000, "班次不存在"); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopService.java index abb0d53..2c20a20 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopService.java @@ -8,7 +8,7 @@ import jakarta.validation.Valid; import java.util.List; -// TODO @AI：方法注释？ +// DONE @AI：方法注释 /** * MES 车间 Service 接口 * @@ -16,16 +16,50 @@ import java.util.List; */ public interface MesMdWorkshopService { + /** + * 创建车间 + * + * @param createReqVO 创建信息 + * @return 编号 + */ Long createWorkshop(@Valid MesMdWorkshopSaveReqVO createReqVO); + /** + * 更新车间 + * + * @param updateReqVO 更新信息 + */ void updateWorkshop(@Valid MesMdWorkshopSaveReqVO updateReqVO); + /** + * 删除车间 + * + * @param id 编号 + */ void deleteWorkshop(Long id); + /** + * 获得车间 + * + * @param id 编号 + * @return 车间 + */ MesMdWorkshopDO getWorkshop(Long id); + /** + * 获得车间分页 + * + * @param pageReqVO 分页查询 + * @return 车间分页 + */ PageResult getWorkshopPage(MesMdWorkshopPageReqVO pageReqVO); + /** + * 获得指定状态的车间列表 + * + * @param status 状态 + * @return 车间列表 + */ List getWorkshopListByStatus(Integer status); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopServiceImpl.java index 412aec9..84d4364 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkshopServiceImpl.java @@ -37,9 +37,9 @@ public class MesMdWorkshopServiceImpl implements MesMdWorkshopService { @Override public Long createWorkshop(MesMdWorkshopSaveReqVO createReqVO) { - // TODO @AI：注释 + // 校验编码唯一 validateWorkshopCodeUnique(null, createReqVO.getCode()); - // TODO @AI：注释 + // 校验名称唯一 validateWorkshopNameUnique(null, createReqVO.getName()); // 插入 @@ -50,11 +50,11 @@ public class MesMdWorkshopServiceImpl implements MesMdWorkshopService { @Override public void updateWorkshop(MesMdWorkshopSaveReqVO updateReqVO) { - // TODO @AI：注释 + // 校验存在 validateWorkshopExists(updateReqVO.getId()); - // TODO @AI：注释 + // 校验编码唯一 validateWorkshopCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); - // TODO @AI：注释 + // 校验名称唯一 validateWorkshopNameUnique(updateReqVO.getId(), updateReqVO.getName()); // 更新 @@ -64,9 +64,9 @@ public class MesMdWorkshopServiceImpl implements MesMdWorkshopService { @Override public void deleteWorkshop(Long id) { - // TODO @AI：注释 + // 校验存在 validateWorkshopExists(id); - // 校验车间下是否存在工位 + // 校验车间下是否存在工作站 Long count = workstationMapper.selectCount(MesMdWorkstationDO::getWorkshopId, id); if (count > 0) { throw exception(MD_WORKSHOP_HAS_WORKSTATION); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineService.java index 8f650b0..b973f3f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineService.java @@ -1,24 +1,39 @@ package cn.iocoder.yudao.module.mes.service.md.workstation; -import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationMachineSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.machine.MesMdWorkstationMachineSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationMachineDO; import jakarta.validation.Valid; import java.util.List; /** - * MES 工位设备 Service 接口 + * MES 设备资源 Service 接口 * * @author 芋道源码 */ public interface MesMdWorkstationMachineService { -// TODO @AI：方法注释？ - + /** + * 创建设备资源 + * + * @param createReqVO 创建信息 + * @return 编号 + */ Long createWorkstationMachine(@Valid MesMdWorkstationMachineSaveReqVO createReqVO); + /** + * 删除设备资源 + * + * @param id 编号 + */ void deleteWorkstationMachine(Long id); + /** + * 获得设备资源列表 + * + * @param workstationId 工作站编号 + * @return 设备资源列表 + */ List getWorkstationMachineListByWorkstationId(Long workstationId); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java index 3d423c4..94bc0a9 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationMachineServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.mes.service.md.workstation; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationMachineSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.machine.MesMdWorkstationMachineSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationMachineDO; import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkstationMachineMapper; import jakarta.annotation.Resource; @@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; /** - * MES 工位设备 Service 实现类 + * MES 设备资源 Service 实现类 * * @author 芋道源码 */ @@ -27,7 +27,7 @@ public class MesMdWorkstationMachineServiceImpl implements MesMdWorkstationMachi @Override public Long createWorkstationMachine(MesMdWorkstationMachineSaveReqVO createReqVO) { - // 校验该设备是否已分配到其他工位 + // 校验该设备是否已分配到其他工作站 MesMdWorkstationMachineDO existing = workstationMachineMapper.selectByMachineryId(createReqVO.getMachineryId()); if (existing != null) { throw exception(MD_WORKSTATION_MACHINE_EXISTS); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationService.java index fccbdac..c036602 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationService.java @@ -9,24 +9,56 @@ import jakarta.validation.Valid; import java.util.List; /** - * MES 工位 Service 接口 + * MES 工作站 Service 接口 * * @author 芋道源码 */ public interface MesMdWorkstationService { - // TODO @AI：方法注释？ - + /** + * 创建工作站 + * + * @param createReqVO 创建信息 + * @return 编号 + */ Long createWorkstation(@Valid MesMdWorkstationSaveReqVO createReqVO); + /** + * 更新工作站 + * + * @param updateReqVO 更新信息 + */ void updateWorkstation(@Valid MesMdWorkstationSaveReqVO updateReqVO); + /** + * 删除工作站 + * + * @param id 编号 + */ void deleteWorkstation(Long id); + /** + * 获得工作站 + * + * @param id 编号 + * @return 工作站 + */ MesMdWorkstationDO getWorkstation(Long id); + /** + * 获得工作站分页 + * + * @param pageReqVO 分页查询 + * @return 工作站分页 + */ PageResult getWorkstationPage(MesMdWorkstationPageReqVO pageReqVO); + /** + * 获得指定状态的工作站列表 + * + * @param status 状态 + * @return 工作站列表 + */ List getWorkstationListByStatus(Integer status); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java index f5daa2d..86e6404 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java @@ -21,7 +21,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; /** - * MES 工位 Service 实现类 + * MES 工作站 Service 实现类 * * @author 芋道源码 */ @@ -46,12 +46,12 @@ public class MesMdWorkstationServiceImpl implements MesMdWorkstationService { @Override public Long createWorkstation(MesMdWorkstationSaveReqVO createReqVO) { - // TODO @AI：注释 + // 校验编码唯一 validateWorkstationCodeUnique(null, createReqVO.getCode()); - // TODO @AI：注释 + // 校验名称唯一 validateWorkstationNameUnique(null, createReqVO.getName()); // 校验车间存在 - workshopService.getWorkshop(createReqVO.getWorkshopId()); // validateWorkshopExists via getWorkshop + workshopService.getWorkshop(createReqVO.getWorkshopId()); // 插入 MesMdWorkstationDO workstation = BeanUtils.toBean(createReqVO, MesMdWorkstationDO.class); @@ -61,11 +61,11 @@ public class MesMdWorkstationServiceImpl implements MesMdWorkstationService { @Override public void updateWorkstation(MesMdWorkstationSaveReqVO updateReqVO) { - // TODO @AI：注释 + // 校验存在 validateWorkstationExists(updateReqVO.getId()); - // TODO @AI：注释 + // 校验编码唯一 validateWorkstationCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); - // TODO @AI：注释 + // 校验名称唯一 validateWorkstationNameUnique(updateReqVO.getId(), updateReqVO.getName()); // 校验车间存在 workshopService.getWorkshop(updateReqVO.getWorkshopId()); @@ -78,14 +78,14 @@ public class MesMdWorkstationServiceImpl implements MesMdWorkstationService { @Override @Transactional(rollbackFor = Exception.class) public void deleteWorkstation(Long id) { - // TODO @AI：注释 + // 校验存在 validateWorkstationExists(id); // 级联删除子资源 workstationMachineMapper.deleteByWorkstationId(id); workstationToolMapper.deleteByWorkstationId(id); workstationWorkerMapper.deleteByWorkstationId(id); - // 删除工位 + // 删除工作站 workstationMapper.deleteById(id); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolService.java index f6d09af..9253b74 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolService.java @@ -7,19 +7,40 @@ import jakarta.validation.Valid; import java.util.List; /** - * MES 工位工具 Service 接口 + * MES 工装夹具资源 Service 接口 * * @author 芋道源码 */ public interface MesMdWorkstationToolService { - // TODO @AI：方法注释？ + /** + * 创建工装夹具资源 + * + * @param createReqVO 创建信息 + * @return 编号 + */ Long createWorkstationTool(@Valid MesMdWorkstationToolSaveReqVO createReqVO); + /** + * 更新工装夹具资源 + * + * @param updateReqVO 更新信息 + */ void updateWorkstationTool(@Valid MesMdWorkstationToolSaveReqVO updateReqVO); + /** + * 删除工装夹具资源 + * + * @param id 编号 + */ void deleteWorkstationTool(Long id); + /** + * 获得工装夹具资源列表 + * + * @param workstationId 工作站编号 + * @return 工装夹具资源列表 + */ List getWorkstationToolListByWorkstationId(Long workstationId); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolServiceImpl.java index 3314d09..bc747e1 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationToolServiceImpl.java @@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; /** - * MES 工位工具 Service 实现类 + * MES 工装夹具资源 Service 实现类 * * @author 芋道源码 */ @@ -27,7 +27,7 @@ public class MesMdWorkstationToolServiceImpl implements MesMdWorkstationToolServ @Override public Long createWorkstationTool(MesMdWorkstationToolSaveReqVO createReqVO) { - // 校验同一工位下工具类型不重复 + // 校验同一工作站下工具类型不重复 MesMdWorkstationToolDO existing = workstationToolMapper.selectByWorkstationIdAndToolTypeId( createReqVO.getWorkstationId(), createReqVO.getToolTypeId()); if (existing != null) { @@ -43,10 +43,7 @@ public class MesMdWorkstationToolServiceImpl implements MesMdWorkstationToolServ @Override public void updateWorkstationTool(MesMdWorkstationToolSaveReqVO updateReqVO) { // 校验存在 - // TODO @AI：要不要抽个方法，参考别的模块 - if (workstationToolMapper.selectById(updateReqVO.getId()) == null) { - throw exception(MD_WORKSTATION_TOOL_NOT_EXISTS); - } + validateWorkstationToolExists(updateReqVO.getId()); // 更新 MesMdWorkstationToolDO updateObj = BeanUtils.toBean(updateReqVO, MesMdWorkstationToolDO.class); @@ -56,14 +53,18 @@ public class MesMdWorkstationToolServiceImpl implements MesMdWorkstationToolServ @Override public void deleteWorkstationTool(Long id) { // 校验存在 - if (workstationToolMapper.selectById(id) == null) { - throw exception(MD_WORKSTATION_TOOL_NOT_EXISTS); - } + validateWorkstationToolExists(id); // 删除 workstationToolMapper.deleteById(id); } + private void validateWorkstationToolExists(Long id) { + if (workstationToolMapper.selectById(id) == null) { + throw exception(MD_WORKSTATION_TOOL_NOT_EXISTS); + } + } + @Override public List getWorkstationToolListByWorkstationId(Long workstationId) { return workstationToolMapper.selectListByWorkstationId(workstationId); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerService.java index 4145656..3a63ce9 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerService.java @@ -7,20 +7,40 @@ import jakarta.validation.Valid; import java.util.List; /** - * MES 工位人员 Service 接口 + * MES 人力资源 Service 接口 * * @author 芋道源码 */ public interface MesMdWorkstationWorkerService { - // TODO @AI：方法注释； - + /** + * 创建人力资源 + * + * @param createReqVO 创建信息 + * @return 编号 + */ Long createWorkstationWorker(@Valid MesMdWorkstationWorkerSaveReqVO createReqVO); + /** + * 更新人力资源 + * + * @param updateReqVO 更新信息 + */ void updateWorkstationWorker(@Valid MesMdWorkstationWorkerSaveReqVO updateReqVO); + /** + * 删除人力资源 + * + * @param id 编号 + */ void deleteWorkstationWorker(Long id); + /** + * 获得人力资源列表 + * + * @param workstationId 工作站编号 + * @return 人力资源列表 + */ List getWorkstationWorkerListByWorkstationId(Long workstationId); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java index af8e52d..e65c94c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationWorkerServiceImpl.java @@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; /** - * MES 工位人员 Service 实现类 + * MES 人力资源 Service 实现类 * * @author 芋道源码 */ @@ -27,7 +27,7 @@ public class MesMdWorkstationWorkerServiceImpl implements MesMdWorkstationWorker @Override public Long createWorkstationWorker(MesMdWorkstationWorkerSaveReqVO createReqVO) { - // 校验同一工位下岗位不重复 + // 校验同一工作站下岗位不重复 MesMdWorkstationWorkerDO existing = workstationWorkerMapper.selectByWorkstationIdAndPostId( createReqVO.getWorkstationId(), createReqVO.getPostId()); if (existing != null) { @@ -42,10 +42,8 @@ public class MesMdWorkstationWorkerServiceImpl implements MesMdWorkstationWorker @Override public void updateWorkstationWorker(MesMdWorkstationWorkerSaveReqVO updateReqVO) { - // TODO @AI：抽个方法，参考别的模块 - if (workstationWorkerMapper.selectById(updateReqVO.getId()) == null) { - throw exception(MD_WORKSTATION_WORKER_NOT_EXISTS); - } + // 校验存在 + validateWorkstationWorkerExists(updateReqVO.getId()); // 更新 MesMdWorkstationWorkerDO updateObj = BeanUtils.toBean(updateReqVO, MesMdWorkstationWorkerDO.class); @@ -54,15 +52,19 @@ public class MesMdWorkstationWorkerServiceImpl implements MesMdWorkstationWorker @Override public void deleteWorkstationWorker(Long id) { - // TODO @AI：抽个方法，参考别的模块 - if (workstationWorkerMapper.selectById(id) == null) { - throw exception(MD_WORKSTATION_WORKER_NOT_EXISTS); - } + // 校验存在 + validateWorkstationWorkerExists(id); // 删除 workstationWorkerMapper.deleteById(id); } + private void validateWorkstationWorkerExists(Long id) { + if (workstationWorkerMapper.selectById(id) == null) { + throw exception(MD_WORKSTATION_WORKER_NOT_EXISTS); + } + } + @Override public List getWorkstationWorkerListByWorkstationId(Long workstationId) { return workstationWorkerMapper.selectListByWorkstationId(workstationId); -- libgit2 0.21.4