Commit 3a18fe6b3dc3a943b64350d49ca13e8580d6d4e6
1 parent
b062c49b
✨ feat(mes): 新增工具类型编码及相关校验逻辑
添加工具类型编码字段，并重构工具类型的保存和更新逻辑，简化数据校验过程。更新表单组件以支持新功能，优化用户体验。
Showing
2 changed files
with
12 additions
and
8 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
| @@ -16,6 +16,7 @@ public enum MesMdAutoCodeRuleCodeEnum { | @@ -16,6 +16,7 @@ public enum MesMdAutoCodeRuleCodeEnum { | ||
| 16 | MD_VENDOR_CODE("MD_VENDOR_CODE", "供应商编码"), | 16 | MD_VENDOR_CODE("MD_VENDOR_CODE", "供应商编码"), |
| 17 | MD_CLIENT_CODE("MD_CLIENT_CODE", "客户编码"), | 17 | MD_CLIENT_CODE("MD_CLIENT_CODE", "客户编码"), |
| 18 | MD_WORKSTATION_CODE("MD_WORKSTATION_CODE", "工作站编码"), | 18 | MD_WORKSTATION_CODE("MD_WORKSTATION_CODE", "工作站编码"), |
| 19 | + TM_TOOL_TYPE_CODE("TM_TOOL_TYPE_CODE", "工具类型编码"), | ||
| 19 | WM_SN_CODE("WM_SN_CODE", "SN 码"), | 20 | WM_SN_CODE("WM_SN_CODE", "SN 码"), |
| 20 | WM_PACKAGE_CODE("WM_PACKAGE_CODE", "装箱单编码"), | 21 | WM_PACKAGE_CODE("WM_PACKAGE_CODE", "装箱单编码"), |
| 21 | WM_BATCH_CODE("WM_BATCH_CODE", "批次编码"), | 22 | WM_BATCH_CODE("WM_BATCH_CODE", "批次编码"), |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolTypeServiceImpl.java
| @@ -38,10 +38,8 @@ public class MesTmToolTypeServiceImpl implements MesTmToolTypeService { | @@ -38,10 +38,8 @@ public class MesTmToolTypeServiceImpl implements MesTmToolTypeService { | ||
| 38 | 38 | ||
| 39 | @Override | 39 | @Override |
| 40 | public Long createToolType(MesTmToolTypeSaveReqVO createReqVO) { | 40 | public Long createToolType(MesTmToolTypeSaveReqVO createReqVO) { |
| 41 | - // 校验编码唯一 | ||
| 42 | - validateToolTypeCodeUnique(null, createReqVO.getCode()); | ||
| 43 | - // 校验名称唯一 | ||
| 44 | - validateToolTypeNameUnique(null, createReqVO.getName()); | 41 | + // 校验数据 |
| 42 | + validateToolTypeSaveData(null, createReqVO); | ||
| 45 | 43 | ||
| 46 | // 插入 | 44 | // 插入 |
| 47 | MesTmToolTypeDO toolType = BeanUtils.toBean(createReqVO, MesTmToolTypeDO.class); | 45 | MesTmToolTypeDO toolType = BeanUtils.toBean(createReqVO, MesTmToolTypeDO.class); |
| @@ -53,16 +51,21 @@ public class MesTmToolTypeServiceImpl implements MesTmToolTypeService { | @@ -53,16 +51,21 @@ public class MesTmToolTypeServiceImpl implements MesTmToolTypeService { | ||
| 53 | public void updateToolType(MesTmToolTypeSaveReqVO updateReqVO) { | 51 | public void updateToolType(MesTmToolTypeSaveReqVO updateReqVO) { |
| 54 | // 校验存在 | 52 | // 校验存在 |
| 55 | validateToolTypeExists(updateReqVO.getId()); | 53 | validateToolTypeExists(updateReqVO.getId()); |
| 56 | - // 校验编码唯一 | ||
| 57 | - validateToolTypeCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); | ||
| 58 | - // 校验名称唯一 | ||
| 59 | - validateToolTypeNameUnique(updateReqVO.getId(), updateReqVO.getName()); | 54 | + // 校验数据 |
| 55 | + validateToolTypeSaveData(updateReqVO.getId(), updateReqVO); | ||
| 60 | 56 | ||
| 61 | // 更新 | 57 | // 更新 |
| 62 | MesTmToolTypeDO updateObj = BeanUtils.toBean(updateReqVO, MesTmToolTypeDO.class); | 58 | MesTmToolTypeDO updateObj = BeanUtils.toBean(updateReqVO, MesTmToolTypeDO.class); |
| 63 | toolTypeMapper.updateById(updateObj); | 59 | toolTypeMapper.updateById(updateObj); |
| 64 | } | 60 | } |
| 65 | 61 | ||
| 62 | + private void validateToolTypeSaveData(Long id, MesTmToolTypeSaveReqVO saveReqVO) { | ||
| 63 | + // 校验编码唯一 | ||
| 64 | + validateToolTypeCodeUnique(id, saveReqVO.getCode()); | ||
| 65 | + // 校验名称唯一 | ||
| 66 | + validateToolTypeNameUnique(id, saveReqVO.getName()); | ||
| 67 | + } | ||
| 68 | + | ||
| 66 | @Override | 69 | @Override |
| 67 | public void deleteToolType(Long id) { | 70 | public void deleteToolType(Long id) { |
| 68 | // 校验存在 | 71 | // 校验存在 |