From 3338bb2b4c8966648390b9a3ef11b9a35db52bd3 Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 12 Mar 2025 16:56:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(hwmom-mes):(MeterSphere10014=E3=80=8115)?= =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E5=A4=A7=E7=B1=BB=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=91=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=A4=A7=E7=B1=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=A4=87=E6=B3=A8=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C=E7=A1=AE=E5=AE=9A=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=EF=BC=9A=E2=80=9C=E5=A4=87=E6=B3=A8=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E2=80=9D=E3=80=81=E3=80=90=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=A1=E6=81=AF=E3=80=91=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=94=AF=E4=B8=80?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BaseMaterialTypeServiceImpl 中增加物料类别名称的唯一性校验 - 修改 BaseDeviceTypeBo 和 BaseMaterialCategoryBo 中的“备注”校验注解 - 移除不必要的备注字段校验 - 修改设备大类 ID 的校验错误信息 --- .../dromara/mes/domain/bo/BaseDeviceTypeBo.java | 8 ++++---- .../mes/domain/bo/BaseMaterialCategoryBo.java | 2 +- .../impl/BaseMaterialTypeServiceImpl.java | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseDeviceTypeBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseDeviceTypeBo.java index 81a7602b..fce67663 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseDeviceTypeBo.java +++ b/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; diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialCategoryBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialCategoryBo.java index 224dd65f..5d48a16c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialCategoryBo.java +++ b/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; diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java index b196fdd4..bd5ff3b3 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java +++ b/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 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("名称已存在"); + } + } + } /**