From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 07 八月 2025 17:23:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java index 0228d7c..390ec70 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java @@ -136,11 +136,11 @@ throw new JeecgBootException("璁惧涓嶅瓨鍦紒"); } if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) { - throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽鍊熷嚭锛�"); + throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽灏佸瓨锛�"); } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (sysUser == null) { - throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞鍊熺敤璁板綍锛�"); + throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞灏佸瓨璁板綍锛�"); } request.setReportUser(sysUser.getUsername()); return equipmentSealUpMapper.insert(request) > 0; @@ -161,9 +161,12 @@ if (equipment == null) { throw new JeecgBootException("璁惧涓嶅瓨鍦紒"); } + if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) { + throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽灏佸瓨锛�"); + } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (sysUser == null) { - throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鍊熺敤璁板綍锛�"); + throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫灏佸瓨璁板綍锛�"); } UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>(); updateWrapper.set("equipment_id", request.getEquipmentId()); @@ -364,6 +367,7 @@ } entity.setUnsealApprovalUser(user.getUsername()); entity.setUnsealApprovalComment(request.getUnsealApprovalComment()); + entity.setUnsealApprovalDealType(request.getUnsealApprovalDealType()); entity.setUnsealApprovalTime(new Date()); // 淇敼璁惧鐘舵�� equipment.setAssetStatus(AssetStatusEnum.NORMAL.name()); -- Gitblit v1.9.3