From ac9c0fdc7a6341d0bff1ae5b649542a6325cfd63 Mon Sep 17 00:00:00 2001 From: 86158 <461356067@qq.com> Date: Thu, 5 Feb 2026 16:18:51 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=B4=A8=E9=87=8F=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E6=A3=80=E9=AA=8C=E7=B1=BB=E5=9E=8B=E5=92=8C?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E7=BC=96=E7=A0=81=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/mes/enums/ErrorCodeConstants.java | 2 ++ .../module/mes/service/zjtask/ZjTaskServiceImpl.java | 12 ++++++++++++ .../module/mes/service/zjtype/ZjTypeServiceImpl.java | 10 ++++++++++ 3 files changed, 24 insertions(+) diff --git a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index cb6adedc8..fca866259 100644 --- a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -113,11 +113,13 @@ public interface ErrorCodeConstants { ErrorCode ZJ_TYPE_NOT_EXISTS = new ErrorCode(5_0090, "检验类型不存在"); + ErrorCode ZJ_TYPE_CODE_EXISTS = new ErrorCode(5_0090, "检验类型编码已存在"); ErrorCode ZJ_ITEM_NOT_EXISTS = new ErrorCode(5_0091, "检验项目不存在"); ErrorCode ZJ_SCHEMA_NOT_EXISTS = new ErrorCode(5_0092, "检验方案不存在"); ErrorCode ZJ_PRODUCT_NOT_EXISTS = new ErrorCode(5_0093, "检验参数不存在"); ErrorCode ZJ_PRODUCT_RECORD_NOT_EXISTS = new ErrorCode(5_0093, "检验参数不存在"); ErrorCode ZJ_TASK_NOT_EXISTS = new ErrorCode(5_0094, "检验任务不存在"); + ErrorCode ZJ_TASK_CODE_EXISTS = new ErrorCode(5_0094, "检验任务单号已存在"); ErrorCode ZJ_TASK_RESULTS_NOT_EXISTS = new ErrorCode(5_0095, "检验任务-检验结果不存在"); ErrorCode GOVIEW_NOT_EXISTS = new ErrorCode(5_0100, "可视化大屏不存在"); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskServiceImpl.java index 722588cae..9ad019dbf 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtask/ZjTaskServiceImpl.java @@ -12,10 +12,12 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagem import cn.iocoder.yudao.module.mes.dal.dataobject.zjitem.ZjItemDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjschema.ZjSchemaDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjtaskresults.ZjTaskResultsDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.zjtype.ZjTypeDO; import cn.iocoder.yudao.module.mes.dal.mysql.zjitem.ZjItemMapper; import cn.iocoder.yudao.module.mes.dal.mysql.zjschema.ZjSchemaMapper; import cn.iocoder.yudao.module.mes.dal.mysql.zjtaskresults.ZjTaskResultsMapper; import cn.iocoder.yudao.module.mes.service.plan.PlanService; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -66,7 +68,10 @@ public class ZjTaskServiceImpl implements ZjTaskService { private PlanService planService; @Override + @Transactional(rollbackFor = Exception.class) public Long createZjTask(ZjTaskSaveReqVO createReqVO) { + // 校验编码是否存在 + validateCodeOnly(createReqVO.getCode()); // 插入 ZjTaskDO zjTask = BeanUtils.toBean(createReqVO, ZjTaskDO.class); zjTaskMapper.insert(zjTask); @@ -111,6 +116,13 @@ public class ZjTaskServiceImpl implements ZjTaskService { return zjTask.getId(); } + private void validateCodeOnly(String code) { + if (zjTaskMapper.exists(Wrappers.lambdaQuery() + .eq(ZjTaskDO::getCode, code))) { + throw exception(ZJ_TASK_CODE_EXISTS); + } + } + @Override public void updateZjTask(ZjTaskSaveReqVO updateReqVO) { // 校验存在 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtype/ZjTypeServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtype/ZjTypeServiceImpl.java index 6af075f0b..99b0a0eec 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtype/ZjTypeServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjtype/ZjTypeServiceImpl.java @@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.mes.service.zjtype; import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.module.iot.dal.dataobject.deviceattributetype.DeviceAttributeTypeDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjitem.ZjItemDO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -34,12 +36,20 @@ public class ZjTypeServiceImpl implements ZjTypeService { @Override public Long createZjType(ZjTypeSaveReqVO createReqVO) { + // 校验编码是否存在 + validateCodeOnly(createReqVO.getCode()); // 插入 ZjTypeDO zjType = BeanUtils.toBean(createReqVO, ZjTypeDO.class); zjTypeMapper.insert(zjType); // 返回 return zjType.getId(); } + private void validateCodeOnly(String code) { + if (zjTypeMapper.exists(Wrappers.lambdaQuery() + .eq(ZjTypeDO::getCode, code))) { + throw exception(ZJ_TYPE_CODE_EXISTS); + } + } @Override public void updateZjType(ZjTypeSaveReqVO updateReqVO) {