From 178278bf8d570ace8cc59ee865035b49333a4421 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 27 五月 2025 17:32:25 +0800
Subject: [PATCH] 设备报废功能增加
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
index 7686edc..e588f05 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
@@ -4,7 +4,9 @@
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
@@ -128,10 +130,30 @@
case PARTIAL_REPAIR:
break;
case LEAN_OUT:
+ if (result instanceof EamEquipmentLeanOut) {
+ EamEquipmentLeanOut order = (EamEquipmentLeanOut) result;
+ if (EquipmentLeanOutStatusEnum.COMPLETE.name().equals(order.getLeanStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getLeanPerson());
+ log.setDescription(order.getLeanReason());
+ log.setCreateTime(order.getLeanStartTime());
+ }
+ }
break;
case GIVE_BACK:
break;
case SEAL_UP:
+ if (result instanceof EamEquipmentSealUp) {
+ EamEquipmentSealUp order = (EamEquipmentSealUp) result;
+ if (EquipmentSealUpStatusEnum.COMPLETE.name().equals(order.getSealStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getReportUser());
+ log.setDescription(order.getSealUpReason());
+ log.setCreateTime(order.getSealEndTime());
+ }
+ }
break;
case UNSEALED:
break;
@@ -148,6 +170,16 @@
}
break;
case SCRAPPED:
+ if (result instanceof EamEquipmentScrap) {
+ EamEquipmentScrap order = (EamEquipmentScrap) result;
+ if (EquipmentScrapStatusEnum.COMPLETE.name().equals(order.getScrapStatus())) {
+ log.setEquipmentId(order.getEquipmentId());
+ log.setBusinessId(order.getId());
+ log.setOperator(order.getReportUser());
+ log.setDescription(order.getScrapReason());
+ log.setCreateTime(order.getScrapTime());
+ }
+ }
break;
default:
break;
--
Gitblit v1.9.3