feat(hwmom-mes):(MeterSphere10014、15)【物料大类信息】新增物料大类信息，备注不是必填项，确定提示：“备注不能为空”、【物料类型信息】物料类型名称，唯一，不允许重复

- 在 BaseMaterialTypeServiceImpl 中增加物料类别名称的唯一性校验
- 修改 BaseDeviceTypeBo 和 BaseMaterialCategoryBo 中的“备注”校验注解
- 移除不必要的备注字段校验
- 修改设备大类 ID 的校验错误信息

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseDeviceTypeBo.java

@@ -47,25 +47,25 @@ public class BaseDeviceTypeBo extends BaseEntity {
     /**
      * 祖级列表
      */
-    @NotBlank(message = "祖级列表不能为空", groups = { AddGroup.class, EditGroup.class })
+/*    @NotBlank(message = "祖级列表不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String ancestors;
 
     /**
      * 设备大类ID（大类ID（关联base_category表category_type为2的））
      */
-    @NotNull(message = "设备大类ID（大类ID（关联base_category表category_type为2的））不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "设备大类不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long categoryId;
 
     /**
      * 激活标识（1是 0否）
      */
-    @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "激活标识不能为空", groups = { AddGroup.class, EditGroup.class })
     private String activeFlag;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+/*    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String remark;
 
 

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialCategoryBo.java

@@ -47,7 +47,7 @@ public class BaseMaterialCategoryBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+/*    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String remark;
 
 

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java

@@ -129,6 +129,8 @@ public class BaseMaterialTypeServiceImpl implements IBaseMaterialTypeService {
      */
     private void validEntityBeforeSave(BaseMaterialType entity){
         //TODO 做一些数据校验,如唯一约束
+
+        //编号校验
         if (StringUtils.isNotBlank(entity.getMatrialTypeCode())) {
             BaseMaterialTypeBo query = new BaseMaterialTypeBo();
             query.setMatrialTypeCode(entity.getMatrialTypeCode());
@@ -138,6 +140,20 @@ public class BaseMaterialTypeServiceImpl implements IBaseMaterialTypeService {
                 throw new ServiceException("编码已存在");
             }
         }
+
+        if (StringUtils.isNotBlank(entity.getMatrialTypeName())) {
+            BaseMaterialTypeBo query = new BaseMaterialTypeBo();
+            query.setMatrialTypeName(entity.getMatrialTypeName());
+            MPJLambdaWrapper<BaseMaterialType> lqw = JoinWrappers.lambda(BaseMaterialType.class)
+                .selectAll(BaseMaterialType.class)
+                .eq(StringUtils.isNotBlank(query.getMatrialTypeName()),BaseMaterialType::getMatrialTypeName, query.getMatrialTypeName());
+            BaseMaterialType baseMaterialType =  baseMapper.selectOne(lqw);
+            if (baseMaterialType != null
+                && !baseMaterialType.getMatrialTypeId().equals(entity.getMatrialTypeId())) {
+                throw new ServiceException("名称已存在");
+            }
+        }
+
     }
 
     /**