From 60311724f9afc274f15cd07320947aca8adf27e4 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 01 八月 2025 16:53:08 +0800
Subject: [PATCH] 班次利用率算法调整

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java |    9 ++++++---
 1 files changed, 6 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..94195b3 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());

--
Gitblit v1.9.3