BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 5a3967dd53bd2c2c4b89140914bff9e636780162

Authored by YunaiV
1 parent 3ec0fc41

✨ feat(mes): 增强设备类型编码的输入验证与生成逻辑 

为设备类型编码字段添加非空验证，确保用户输入有效数据。同时，更新前端表单，允许用户手动输入或点击生成按钮来生成编码，提升用户体验。
Inline Side-by-side
Showing 2 changed files with 2 additions and 10 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/type/MesDvMachineryTypeSaveReqVO.java
  View file @5a3967d
@@ -12,7 +12,8 @@ public class MesDvMachineryTypeSaveReqVO { @@ -12,7 +12,8 @@ public class MesDvMachineryTypeSaveReqVO {
12 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") 12 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 private Long id; 13 private Long id;
14 14
15 - @Schema(description = "类型编码", example = "MT-001") 15 + @Schema(description = "类型编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "MT-001")
  16 + @NotEmpty(message = "类型编码不能为空")
16 private String code; 17 private String code;
17 18
18 @Schema(description = "类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "数控机床") 19 @Schema(description = "类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "数控机床")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryTypeServiceImpl.java
  View file @5a3967d
@@ -2,14 +2,11 @@ package cn.iocoder.yudao.module.mes.service.dv.machinery; @@ -2,14 +2,11 @@ package cn.iocoder.yudao.module.mes.service.dv.machinery;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.util.ObjUtil; 4 import cn.hutool.core.util.ObjUtil;
5 -import cn.hutool.core.util.StrUtil;  
6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 5 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
7 import cn.iocoder.yudao.module.mes.controller.admin.dv.machinery.vo.type.MesDvMachineryTypeListReqVO; 6 import cn.iocoder.yudao.module.mes.controller.admin.dv.machinery.vo.type.MesDvMachineryTypeListReqVO;
8 import cn.iocoder.yudao.module.mes.controller.admin.dv.machinery.vo.type.MesDvMachineryTypeSaveReqVO; 7 import cn.iocoder.yudao.module.mes.controller.admin.dv.machinery.vo.type.MesDvMachineryTypeSaveReqVO;
9 import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryTypeDO; 8 import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryTypeDO;
10 import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryTypeMapper; 9 import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryTypeMapper;
11 -import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;  
12 -import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;  
13 import jakarta.annotation.Resource; 10 import jakarta.annotation.Resource;
14 import org.springframework.context.annotation.Lazy; 11 import org.springframework.context.annotation.Lazy;
15 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
@@ -35,15 +32,9 @@ public class MesDvMachineryTypeServiceImpl implements MesDvMachineryTypeService @@ -35,15 +32,9 @@ public class MesDvMachineryTypeServiceImpl implements MesDvMachineryTypeService
35 @Resource 32 @Resource
36 @Lazy // 延迟加载，避免循环依赖 33 @Lazy // 延迟加载，避免循环依赖
37 private MesDvMachineryService machineryService; 34 private MesDvMachineryService machineryService;
38 - @Resource  
39 - private MesMdAutoCodeRecordService autoCodeRecordService;  
40 35
41 @Override 36 @Override
42 public Long createMachineryType(MesDvMachineryTypeSaveReqVO createReqVO) { 37 public Long createMachineryType(MesDvMachineryTypeSaveReqVO createReqVO) {
43 - // 自动生成编码  
44 - if (StrUtil.isEmpty(createReqVO.getCode())) {  
45 - createReqVO.setCode(autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.DV_MACHINERY_TYPE_CODE.getCode()));  
46 - }  
47 // 校验 38 // 校验
48 validateMachineryTypeSaveData(createReqVO); 39 validateMachineryTypeSaveData(createReqVO);
49 40