From 84ba58b0e2b8d4e0f354a4651b6a1420fe08aa40 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 20 三月 2025 17:20:15 +0800
Subject: [PATCH] art: 设备管理-设备履历添加 验收履历

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 77338b0..9122818 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
 import org.jeecg.modules.eam.constant.AssetStatusEnum;
 import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
+import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
 import org.jeecg.modules.eam.constant.EquipmentRepairStatus;
 import org.jeecg.modules.eam.entity.EamEquipment;
 import org.jeecg.modules.eam.entity.EamEquipmentExtend;
@@ -32,9 +34,10 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean saveEquipment(EamEquipment eamEquipment) {
+    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.ACCEPTANCE, businessTable = "eam_equipment")
+    public EamEquipment saveEquipment(EamEquipment eamEquipment) {
         if (eamEquipment == null) {
-            return false;
+            return null;
         }
         //璧勪骇鐘舵�侀粯璁� 姝e父
         eamEquipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
@@ -50,6 +53,6 @@
         equipmentExtendService.save(eamEquipmentExtend);
 
         //鎻掑叆璁惧灞ュ巻 TODO
-        return true;
+        return eamEquipment;
     }
 }

--
Gitblit v1.9.3