From 6ddbb29422b14e4c4e838e936cfc23676b0cc9ed Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 18 Feb 2026 15:47:18 +0800 Subject: [PATCH] review（mes）：pro-process 的初步实现 50% --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessContentController.java | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessPageReqVO.java | 33 +++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java | 33 +++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java | 33 +++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentPageReqVO.java | 20 ++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentRespVO.java | 39 +++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentSaveReqVO.java | 37 +++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/vo/process/MesProProcessPageReqVO.java | 33 --------------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessContentMapper.java | 29 +++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessMapper.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentService.java | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentServiceImpl.java | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessService.java | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessServiceImpl.java | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 15 files changed, 778 insertions(+), 33 deletions(-) create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessContentController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentSaveReqVO.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/vo/process/MesProProcessPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessContentMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentServiceImpl.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessServiceImpl.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessContentController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessContentController.java new file mode 100644 index 0000000..4eaf266 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessContentController.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.process; + +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.pro.process.vo.content.MesProProcessContentRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.content.MesProProcessContentSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.MesProProcessContentDO; +import cn.iocoder.yudao.module.mes.service.pro.MesProProcessContentService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - MES 生产工序内容") +@RestController +@RequestMapping("/mes/pro/process-content") +@Validated +public class MesProProcessContentController { + + @Resource + private MesProProcessContentService processContentService; + + @PostMapping("/create") + @Operation(summary = "创建生产工序内容") + @PreAuthorize("@ss.hasPermission('mes:pro-process:update')") + public CommonResult createProcessContent(@Valid @RequestBody MesProProcessContentSaveReqVO createReqVO) { + return success(processContentService.createProcessContent(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新生产工序内容") + @PreAuthorize("@ss.hasPermission('mes:pro-process:update')") + public CommonResult updateProcessContent(@Valid @RequestBody MesProProcessContentSaveReqVO updateReqVO) { + processContentService.updateProcessContent(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除生产工序内容") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:pro-process:update')") + public CommonResult deleteProcessContent(@RequestParam("id") Long id) { + processContentService.deleteProcessContent(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得生产工序内容") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:pro-process:query')") + public CommonResult getProcessContent(@RequestParam("id") Long id) { + MesProProcessContentDO content = processContentService.getProcessContent(id); + return success(BeanUtils.toBean(content, MesProProcessContentRespVO.class)); + } + + @GetMapping("/list-by-process") + @Operation(summary = "获得生产工序内容列表（按工序编号）") + @Parameter(name = "processId", description = "工序编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:pro-process:query')") + public CommonResult> getProcessContentListByProcessId(@RequestParam("processId") Long processId) { + List list = processContentService.getProcessContentListByProcessId(processId); + return success(BeanUtils.toBean(list, MesProProcessContentRespVO.class)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java new file mode 100644 index 0000000..6f906a7 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java @@ -0,0 +1,102 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.process; + +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.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.MesProProcessDO; +import cn.iocoder.yudao.module.mes.service.pro.MesProProcessService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +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; + +@Tag(name = "管理后台 - MES 生产工序") +@RestController +@RequestMapping("/mes/pro/process") +@Validated +public class MesProProcessController { + + @Resource + private MesProProcessService processService; + + @PostMapping("/create") + @Operation(summary = "创建生产工序") + @PreAuthorize("@ss.hasPermission('mes:pro-process:create')") + public CommonResult createProcess(@Valid @RequestBody MesProProcessSaveReqVO createReqVO) { + return success(processService.createProcess(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新生产工序") + @PreAuthorize("@ss.hasPermission('mes:pro-process:update')") + public CommonResult updateProcess(@Valid @RequestBody MesProProcessSaveReqVO updateReqVO) { + processService.updateProcess(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除生产工序") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:pro-process:delete')") + public CommonResult deleteProcess(@RequestParam("id") Long id) { + processService.deleteProcess(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得生产工序") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:pro-process:query')") + public CommonResult getProcess(@RequestParam("id") Long id) { + MesProProcessDO process = processService.getProcess(id); + return success(BeanUtils.toBean(process, MesProProcessRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得生产工序分页") + @PreAuthorize("@ss.hasPermission('mes:pro-process:query')") + public CommonResult> getProcessPage(@Valid MesProProcessPageReqVO pageReqVO) { + PageResult pageResult = processService.getProcessPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MesProProcessRespVO.class)); + } + + @GetMapping("/simple-list") + @Operation(summary = "获得生产工序精简列表", description = "只包含被开启的工序，主要用于前端的下拉选项") + public CommonResult> getProcessSimpleList() { + List list = processService.getProcessListByStatus(CommonStatusEnum.ENABLE.getStatus()); + return success(convertList(list, process -> new MesProProcessRespVO() + .setId(process.getId()).setName(process.getName()).setCode(process.getCode()))); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出生产工序 Excel") + @PreAuthorize("@ss.hasPermission('mes:pro-process:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportProcessExcel(@Valid MesProProcessPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = processService.getProcessPage(pageReqVO).getList(); + List data = BeanUtils.toBean(list, MesProProcessRespVO.class); + ExcelUtils.write(response, "生产工序.xls", "数据", MesProProcessRespVO.class, data); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessPageReqVO.java new file mode 100644 index 0000000..ff0289f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessPageReqVO.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - MES 生产工序分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesProProcessPageReqVO extends PageParam { + + @Schema(description = "工序编码", example = "PROCESS001") + private String code; + + @Schema(description = "工序名称", example = "下料工序") + private String name; + + @Schema(description = "状态", example = "0") + private Integer status; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java new file mode 100644 index 0000000..27a2414 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessRespVO.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 生产工序 Response VO") +@Data +public class MesProProcessRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "工序编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "PROCESS001") + private String code; + + @Schema(description = "工序名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "下料工序") + private String name; + + @Schema(description = "工艺要求", example = "按照图纸尺寸进行切割") + private String attention; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + private Integer status; + + @Schema(description = "备注", example = "金属板材下料") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java new file mode 100644 index 0000000..2abbd0c --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/MesProProcessSaveReqVO.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 生产工序新增/修改 Request VO") +@Data +public class MesProProcessSaveReqVO { + + @Schema(description = "编号", example = "1") + private Long id; + + @Schema(description = "工序编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "PROCESS001") + @NotBlank(message = "工序编码不能为空") + private String code; + + @Schema(description = "工序名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "下料工序") + @NotBlank(message = "工序名称不能为空") + private String name; + + @Schema(description = "工艺要求", example = "按照图纸尺寸进行切割") + private String attention; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + @NotNull(message = "状态不能为空") + private Integer status; + + @Schema(description = "备注", example = "金属板材下料") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentPageReqVO.java new file mode 100644 index 0000000..beb5295 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentPageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.content; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 生产工序内容分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesProProcessContentPageReqVO extends PageParam { + + @Schema(description = "工序编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "工序编号不能为空") + private Long processId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentRespVO.java new file mode 100644 index 0000000..5881b66 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentRespVO.java @@ -0,0 +1,39 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.content; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 生产工序内容 Response VO") +@Data +public class MesProProcessContentRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "工序编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long processId; + + @Schema(description = "顺序编号", example = "1") + private Integer sort; + + @Schema(description = "步骤说明", example = "检查焊接设备是否正常") + private String content; + + @Schema(description = "辅助设备", example = "氩弧焊机") + private String device; + + @Schema(description = "辅助材料", example = "焊丝 ER308") + private String material; + + @Schema(description = "材料文档 URL", example = "https://example.com/doc.pdf") + private String docUrl; + + @Schema(description = "备注", example = "注意安全") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentSaveReqVO.java new file mode 100644 index 0000000..ef51a04 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/vo/content/MesProProcessContentSaveReqVO.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.content; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 生产工序内容新增/修改 Request VO") +@Data +public class MesProProcessContentSaveReqVO { + + @Schema(description = "编号", example = "1") + private Long id; + + @Schema(description = "工序编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "工序编号不能为空") + private Long processId; + + @Schema(description = "顺序编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "顺序编号不能为空") + private Integer sort; + + @Schema(description = "步骤说明", example = "检查焊接设备是否正常") + private String content; + + @Schema(description = "辅助设备", example = "氩弧焊机") + private String device; + + @Schema(description = "辅助材料", example = "焊丝 ER308") + private String material; + + @Schema(description = "材料文档 URL", example = "https://example.com/doc.pdf") + private String docUrl; + + @Schema(description = "备注", example = "注意安全") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/vo/process/MesProProcessPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/vo/process/MesProProcessPageReqVO.java deleted file mode 100644 index 2f75f3f..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/vo/process/MesProProcessPageReqVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.pro.vo.process; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - MES 生产工序分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MesProProcessPageReqVO extends PageParam { - - @Schema(description = "工序编码", example = "PROCESS001") - private String code; - - @Schema(description = "工序名称", example = "下料工序") - private String name; - - @Schema(description = "状态", example = "0") - private Integer status; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessContentMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessContentMapper.java new file mode 100644 index 0000000..6bfd397 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessContentMapper.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.pro; + +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.MesProProcessContentDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 生产工序内容 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesProProcessContentMapper extends BaseMapperX { + + default List selectListByProcessId(Long processId) { + return selectList(new LambdaQueryWrapperX() + .eq(MesProProcessContentDO::getProcessId, processId) + .orderByAsc(MesProProcessContentDO::getSort)); + } + + default void deleteByProcessId(Long processId) { + delete(new LambdaQueryWrapperX() + .eq(MesProProcessContentDO::getProcessId, processId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessMapper.java new file mode 100644 index 0000000..0fcdc5e --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/MesProProcessMapper.java @@ -0,0 +1,50 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.pro; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.MesProProcessDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 生产工序 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesProProcessMapper extends BaseMapperX { + + default PageResult selectPage(MesProProcessPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesProProcessDO::getCode, reqVO.getCode()) + .likeIfPresent(MesProProcessDO::getName, reqVO.getName()) + .eqIfPresent(MesProProcessDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesProProcessDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(MesProProcessDO::getId)); + } + + default List selectList(MesProProcessPageReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .likeIfPresent(MesProProcessDO::getCode, reqVO.getCode()) + .likeIfPresent(MesProProcessDO::getName, reqVO.getName()) + .eqIfPresent(MesProProcessDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesProProcessDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(MesProProcessDO::getId)); + } + + default MesProProcessDO selectByCode(String code) { + return selectOne(MesProProcessDO::getCode, code); + } + + default MesProProcessDO selectByName(String name) { + return selectOne(MesProProcessDO::getName, name); + } + + default List selectListByStatus(Integer status) { + return selectList(MesProProcessDO::getStatus, status); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentService.java new file mode 100644 index 0000000..06b8a9f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentService.java @@ -0,0 +1,61 @@ +package cn.iocoder.yudao.module.mes.service.pro; + +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.content.MesProProcessContentSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.MesProProcessContentDO; + +import jakarta.validation.Valid; +import java.util.List; + +/** + * MES 生产工序内容 Service 接口 + * + * @author 芋道源码 + */ +public interface MesProProcessContentService { + + /** + * 创建生产工序内容 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createProcessContent(@Valid MesProProcessContentSaveReqVO createReqVO); + + /** + * 更新生产工序内容 + * + * @param updateReqVO 更新信息 + */ + void updateProcessContent(@Valid MesProProcessContentSaveReqVO updateReqVO); + + /** + * 删除生产工序内容 + * + * @param id 编号 + */ + void deleteProcessContent(Long id); + + /** + * 获得生产工序内容 + * + * @param id 编号 + * @return 生产工序内容 + */ + MesProProcessContentDO getProcessContent(Long id); + + /** + * 获得生产工序内容列表（按工序编号） + * + * @param processId 工序编号 + * @return 生产工序内容列表 + */ + List getProcessContentListByProcessId(Long processId); + + /** + * 删除生产工序内容（按工序编号） + * + * @param processId 工序编号 + */ + void deleteProcessContentByProcessId(Long processId); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentServiceImpl.java new file mode 100644 index 0000000..c001eac --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessContentServiceImpl.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.mes.service.pro; + +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.content.MesProProcessContentSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.MesProProcessContentDO; +import cn.iocoder.yudao.module.mes.dal.mysql.pro.MesProProcessContentMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_PROCESS_CONTENT_NOT_EXISTS; + +/** + * MES 生产工序内容 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesProProcessContentServiceImpl implements MesProProcessContentService { + + @Resource + private MesProProcessContentMapper processContentMapper; + + @Override + public Long createProcessContent(MesProProcessContentSaveReqVO createReqVO) { + MesProProcessContentDO content = BeanUtils.toBean(createReqVO, MesProProcessContentDO.class); + processContentMapper.insert(content); + return content.getId(); + } + + @Override + public void updateProcessContent(MesProProcessContentSaveReqVO updateReqVO) { + // 校验存在 + validateProcessContentExists(updateReqVO.getId()); + // 更新 + MesProProcessContentDO updateObj = BeanUtils.toBean(updateReqVO, MesProProcessContentDO.class); + processContentMapper.updateById(updateObj); + } + + @Override + public void deleteProcessContent(Long id) { + // 校验存在 + validateProcessContentExists(id); + // 删除 + processContentMapper.deleteById(id); + } + + private void validateProcessContentExists(Long id) { + if (processContentMapper.selectById(id) == null) { + throw exception(PRO_PROCESS_CONTENT_NOT_EXISTS); + } + } + + @Override + public MesProProcessContentDO getProcessContent(Long id) { + return processContentMapper.selectById(id); + } + + @Override + public List getProcessContentListByProcessId(Long processId) { + return processContentMapper.selectListByProcessId(processId); + } + + @Override + public void deleteProcessContentByProcessId(Long processId) { + processContentMapper.deleteByProcessId(processId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessService.java new file mode 100644 index 0000000..f25d639 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessService.java @@ -0,0 +1,72 @@ +package cn.iocoder.yudao.module.mes.service.pro; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.MesProProcessDO; + +import jakarta.validation.Valid; +import java.util.List; + +/** + * MES 生产工序 Service 接口 + * + * @author 芋道源码 + */ +public interface MesProProcessService { + + /** + * 创建生产工序 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createProcess(@Valid MesProProcessSaveReqVO createReqVO); + + /** + * 更新生产工序 + * + * @param updateReqVO 更新信息 + */ + void updateProcess(@Valid MesProProcessSaveReqVO updateReqVO); + + /** + * 删除生产工序 + * + * @param id 编号 + */ + void deleteProcess(Long id); + + /** + * 获得生产工序 + * + * @param id 编号 + * @return 生产工序 + */ + MesProProcessDO getProcess(Long id); + + /** + * 获得生产工序列表 + * + * @param ids 编号列表 + * @return 生产工序列表 + */ + List getProcessList(List ids); + + /** + * 获得生产工序分页 + * + * @param pageReqVO 分页查询 + * @return 生产工序分页 + */ + PageResult getProcessPage(MesProProcessPageReqVO pageReqVO); + + /** + * 获得指定状态的生产工序列表 + * + * @param status 状态 + * @return 生产工序列表 + */ + List getProcessListByStatus(Integer status); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessServiceImpl.java new file mode 100644 index 0000000..6c12960 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/MesProProcessServiceImpl.java @@ -0,0 +1,123 @@ +package cn.iocoder.yudao.module.mes.service.pro; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.MesProProcessDO; +import cn.iocoder.yudao.module.mes.dal.mysql.pro.MesProProcessMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +/** + * MES 生产工序 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesProProcessServiceImpl implements MesProProcessService { + + @Resource + private MesProProcessMapper processMapper; + + @Resource + private MesProProcessContentService processContentService; + + @Override + public Long createProcess(MesProProcessSaveReqVO createReqVO) { + // 1. 校验工序编码唯一性 + validateProcessCodeUnique(null, createReqVO.getCode()); + // 2. 校验工序名称唯一性 + validateProcessNameUnique(null, createReqVO.getName()); + // 3. 插入工序 + MesProProcessDO process = BeanUtils.toBean(createReqVO, MesProProcessDO.class); + processMapper.insert(process); + return process.getId(); + } + + @Override + public void updateProcess(MesProProcessSaveReqVO updateReqVO) { + // 1. 校验存在 + validateProcessExists(updateReqVO.getId()); + // 2. 校验工序编码唯一性 + validateProcessCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + // 3. 校验工序名称唯一性 + validateProcessNameUnique(updateReqVO.getId(), updateReqVO.getName()); + // 4. 更新工序 + MesProProcessDO updateObj = BeanUtils.toBean(updateReqVO, MesProProcessDO.class); + processMapper.updateById(updateObj); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteProcess(Long id) { + // 1. 校验存在 + validateProcessExists(id); + // TODO @芋艿：校验是否被工艺路线引用（pro_route_process 表实现后） + // 2. 删除工序 + processMapper.deleteById(id); + // 3. 级联删除工序内容 + processContentService.deleteProcessContentByProcessId(id); + } + + private void validateProcessExists(Long id) { + if (processMapper.selectById(id) == null) { + throw exception(PRO_PROCESS_NOT_EXISTS); + } + } + + private void validateProcessCodeUnique(Long id, String code) { + MesProProcessDO process = processMapper.selectByCode(code); + if (process == null) { + return; + } + if (id == null) { + throw exception(PRO_PROCESS_CODE_EXISTS); + } + if (!process.getId().equals(id)) { + throw exception(PRO_PROCESS_CODE_EXISTS); + } + } + + private void validateProcessNameUnique(Long id, String name) { + MesProProcessDO process = processMapper.selectByName(name); + if (process == null) { + return; + } + if (id == null) { + throw exception(PRO_PROCESS_NAME_EXISTS); + } + if (!process.getId().equals(id)) { + throw exception(PRO_PROCESS_NAME_EXISTS); + } + } + + @Override + public MesProProcessDO getProcess(Long id) { + return processMapper.selectById(id); + } + + @Override + public List getProcessList(List ids) { + return processMapper.selectBatchIds(ids); + } + + @Override + public PageResult getProcessPage(MesProProcessPageReqVO pageReqVO) { + return processMapper.selectPage(pageReqVO); + } + + @Override + public List getProcessListByStatus(Integer status) { + return processMapper.selectListByStatus(status); + } + +} -- libgit2 0.21.4