From 9b22a9cf4d17fd403f5c87e4b719ff9f9068b26f Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 20 Feb 2026 09:49:49 +0800 Subject: [PATCH] feat(mes): 新增 MES 点检保养项目相关功能，包括请求和响应 VO、Controller 及 API 接口 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectPageReqVO.java | 27 +++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectRespVO.java | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectSaveReqVO.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/subject/MesDvSubjectDO.java | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/subject/MesDvSubjectMapper.java | 26 ++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java | 3 +++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java | 3 +++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java | 2 ++ 11 files changed, 495 insertions(+), 0 deletions(-) create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/subject/MesDvSubjectDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/subject/MesDvSubjectMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java new file mode 100644 index 0000000..d1258cf --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java @@ -0,0 +1,93 @@ +package cn.iocoder.yudao.module.mes.controller.admin.dv.subject; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +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.dv.subject.vo.MesDvSubjectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.dv.subject.MesDvSubjectDO; +import cn.iocoder.yudao.module.mes.service.dv.subject.MesDvSubjectService; +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; + +@Tag(name = "管理后台 - MES 点检保养项目") +@RestController +@RequestMapping("/mes/dv/subject") +@Validated +public class MesDvSubjectController { + + @Resource + private MesDvSubjectService subjectService; + + @PostMapping("/create") + @Operation(summary = "创建点检保养项目") + @PreAuthorize("@ss.hasPermission('mes:dv-subject:create')") + public CommonResult createSubject(@Valid @RequestBody MesDvSubjectSaveReqVO createReqVO) { + return success(subjectService.createSubject(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新点检保养项目") + @PreAuthorize("@ss.hasPermission('mes:dv-subject:update')") + public CommonResult updateSubject(@Valid @RequestBody MesDvSubjectSaveReqVO updateReqVO) { + subjectService.updateSubject(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除点检保养项目") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:dv-subject:delete')") + public CommonResult deleteSubject(@RequestParam("id") Long id) { + subjectService.deleteSubject(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得点检保养项目") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')") + public CommonResult getSubject(@RequestParam("id") Long id) { + MesDvSubjectDO subject = subjectService.getSubject(id); + return success(BeanUtils.toBean(subject, MesDvSubjectRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得点检保养项目分页") + @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')") + public CommonResult> getSubjectPage(@Valid MesDvSubjectPageReqVO pageReqVO) { + PageResult pageResult = subjectService.getSubjectPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MesDvSubjectRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出点检保养项目 Excel") + @PreAuthorize("@ss.hasPermission('mes:dv-subject:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportSubjectExcel(@Valid MesDvSubjectPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = subjectService.getSubjectPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "点检保养项目.xls", "数据", MesDvSubjectRespVO.class, + BeanUtils.toBean(list, MesDvSubjectRespVO.class)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectPageReqVO.java new file mode 100644 index 0000000..73495d9 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectPageReqVO.java @@ -0,0 +1,27 @@ +package cn.iocoder.yudao.module.mes.controller.admin.dv.subject.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; + +@Schema(description = "管理后台 - MES 点检保养项目分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesDvSubjectPageReqVO extends PageParam { + + @Schema(description = "项目编码", example = "CHK001") + private String code; + + @Schema(description = "项目名称", example = "注塑机外观检查") + private String name; + + @Schema(description = "项目类型", example = "1") + private Integer type; + + @Schema(description = "状态", example = "0") + private Integer status; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectRespVO.java new file mode 100644 index 0000000..3b4f200 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectRespVO.java @@ -0,0 +1,68 @@ +package cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo; + +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import cn.iocoder.yudao.module.mes.enums.DictTypeConstants; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 点检保养项目 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MesDvSubjectRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "项目编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "CHK001") + @ExcelProperty("项目编码") + private String code; + + @Schema(description = "项目名称", example = "注塑机外观检查") + @ExcelProperty("项目名称") + private String name; + + @Schema(description = "项目类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty(value = "项目类型", converter = DictConvert.class) + @DictFormat(DictTypeConstants.MES_DV_SUBJECT_TYPE) + private Integer type; + + @Schema(description = "项目内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "检查注塑机外壳是否有裂纹") + @ExcelProperty("项目内容") + private String content; + + @Schema(description = "标准", example = "外观完好，无明显损伤") + @ExcelProperty("标准") + private String standard; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + @ExcelProperty(value = "状态", converter = DictConvert.class) + @DictFormat("common_status") + private Integer status; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectSaveReqVO.java new file mode 100644 index 0000000..fac8ab8 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/vo/MesDvSubjectSaveReqVO.java @@ -0,0 +1,52 @@ +package cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 点检保养项目新增/修改 Request VO") +@Data +public class MesDvSubjectSaveReqVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "项目编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "CHK001") + @NotEmpty(message = "项目编码不能为空") + private String code; + + @Schema(description = "项目名称", example = "注塑机外观检查") + private String name; + + @Schema(description = "项目类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "项目类型不能为空") + private Integer type; + + @Schema(description = "项目内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "检查注塑机外壳是否有裂纹") + @NotEmpty(message = "项目内容不能为空") + private String content; + + @Schema(description = "标准", example = "外观完好，无明显损伤") + private String standard; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + @NotNull(message = "状态不能为空") + private Integer status; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/subject/MesDvSubjectDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/subject/MesDvSubjectDO.java new file mode 100644 index 0000000..1040ea4 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/subject/MesDvSubjectDO.java @@ -0,0 +1,78 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.dv.subject; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +/** + * MES 点检保养项目 DO + * + * @author 芋道源码 + */ +@TableName("mes_dv_subject") +@KeySequence("mes_dv_subject_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesDvSubjectDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 项目编码 + */ + private String code; + /** + * 项目名称 + */ + private String name; + /** + * 项目类型 + * + * 字典类型 mes_dv_subject_type + */ + private Integer type; + /** + * 项目内容 + */ + private String content; + /** + * 标准 + */ + private String standard; + /** + * 状态 + * + * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum} + */ + private Integer status; + /** + * 备注 + */ + private String remark; + /** + * 预留字段1 + */ + private String attribute1; + /** + * 预留字段2 + */ + private String attribute2; + /** + * 预留字段3 + */ + private Integer attribute3; + /** + * 预留字段4 + */ + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/subject/MesDvSubjectMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/subject/MesDvSubjectMapper.java new file mode 100644 index 0000000..99dd627 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/subject/MesDvSubjectMapper.java @@ -0,0 +1,26 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.dv.subject; + +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.dv.subject.vo.MesDvSubjectPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.dv.subject.MesDvSubjectDO; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MesDvSubjectMapper extends BaseMapperX { + + default PageResult selectPage(MesDvSubjectPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesDvSubjectDO::getCode, reqVO.getCode()) + .likeIfPresent(MesDvSubjectDO::getName, reqVO.getName()) + .eqIfPresent(MesDvSubjectDO::getType, reqVO.getType()) + .eqIfPresent(MesDvSubjectDO::getStatus, reqVO.getStatus()) + .orderByDesc(MesDvSubjectDO::getId)); + } + + default MesDvSubjectDO selectByCode(String code) { + return selectOne(MesDvSubjectDO::getCode, code); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java new file mode 100644 index 0000000..f022315 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java @@ -0,0 +1,54 @@ +package cn.iocoder.yudao.module.mes.service.dv.subject; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.dv.subject.MesDvSubjectDO; +import jakarta.validation.Valid; + +/** + * MES 点检保养项目 Service 接口 + * + * @author 芋道源码 + */ +public interface MesDvSubjectService { + + /** + * 创建点检保养项目 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createSubject(@Valid MesDvSubjectSaveReqVO createReqVO); + + /** + * 更新点检保养项目 + * + * @param updateReqVO 更新信息 + */ + void updateSubject(@Valid MesDvSubjectSaveReqVO updateReqVO); + + /** + * 删除点检保养项目 + * + * @param id 编号 + */ + void deleteSubject(Long id); + + /** + * 获得点检保养项目 + * + * @param id 编号 + * @return 点检保养项目 + */ + MesDvSubjectDO getSubject(Long id); + + /** + * 获得点检保养项目分页 + * + * @param pageReqVO 分页查询 + * @return 点检保养项目分页 + */ + PageResult getSubjectPage(MesDvSubjectPageReqVO pageReqVO); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java new file mode 100644 index 0000000..94ef38e --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java @@ -0,0 +1,89 @@ +package cn.iocoder.yudao.module.mes.service.dv.subject; + +import cn.hutool.core.util.ObjUtil; +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.dv.subject.vo.MesDvSubjectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.dv.subject.MesDvSubjectDO; +import cn.iocoder.yudao.module.mes.dal.mysql.dv.subject.MesDvSubjectMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +/** + * MES 点检保养项目 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesDvSubjectServiceImpl implements MesDvSubjectService { + + @Resource + private MesDvSubjectMapper subjectMapper; + + @Override + public Long createSubject(MesDvSubjectSaveReqVO createReqVO) { + // 校验编码唯一 + validateSubjectCodeUnique(null, createReqVO.getCode()); + + // 插入 + MesDvSubjectDO subject = BeanUtils.toBean(createReqVO, MesDvSubjectDO.class); + subjectMapper.insert(subject); + return subject.getId(); + } + + @Override + public void updateSubject(MesDvSubjectSaveReqVO updateReqVO) { + // 校验存在 + validateSubjectExists(updateReqVO.getId()); + // 校验编码唯一 + validateSubjectCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + + // 更新 + MesDvSubjectDO updateObj = BeanUtils.toBean(updateReqVO, MesDvSubjectDO.class); + subjectMapper.updateById(updateObj); + } + + @Override + public void deleteSubject(Long id) { + // 校验存在 + validateSubjectExists(id); + // 删除 + subjectMapper.deleteById(id); + } + + private void validateSubjectExists(Long id) { + if (subjectMapper.selectById(id) == null) { + throw exception(DV_SUBJECT_NOT_EXISTS); + } + } + + private void validateSubjectCodeUnique(Long id, String code) { + if (code == null) { + return; + } + MesDvSubjectDO subject = subjectMapper.selectByCode(code); + if (subject == null) { + return; + } + if (ObjUtil.notEqual(subject.getId(), id)) { + throw exception(DV_SUBJECT_CODE_DUPLICATE); + } + } + + @Override + public MesDvSubjectDO getSubject(Long id) { + return subjectMapper.selectById(id); + } + + @Override + public PageResult getSubjectPage(MesDvSubjectPageReqVO pageReqVO) { + return subjectMapper.selectPage(pageReqVO); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java index 2cd1120..5798542 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseAreaMapp import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService; import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService; import jakarta.annotation.Resource; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -32,10 +33,12 @@ public class MesWmWarehouseAreaServiceImpl implements MesWmWarehouseAreaService private MesWmWarehouseAreaMapper areaMapper; @Resource + @Lazy private MesMdWorkstationService workstationService; @Resource private MesWmMaterialStockService materialStockService; @Resource + @Lazy private MesWmWarehouseLocationService locationService; @Override diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java index c4e1241..4050b3d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseLocation import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService; import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService; import jakarta.annotation.Resource; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -34,10 +35,12 @@ public class MesWmWarehouseLocationServiceImpl implements MesWmWarehouseLocation @Resource private MesWmWarehouseAreaService areaService; @Resource + @Lazy private MesMdWorkstationService workstationService; @Resource private MesWmMaterialStockService materialStockService; @Resource + @Lazy private MesWmWarehouseService warehouseService; @Override diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java index b2e33cd..85330d6 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseMapper; import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService; import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService; import jakarta.annotation.Resource; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -34,6 +35,7 @@ public class MesWmWarehouseServiceImpl implements MesWmWarehouseService { @Resource private MesWmWarehouseLocationService locationService; @Resource + @Lazy private MesMdWorkstationService workstationService; @Resource private MesWmMaterialStockService materialStockService; -- libgit2 0.21.4