From 4c50c77f3a5cf63746068d4a703e65792701bc09 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 30 五月 2025 16:42:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index b704de3..bb23cb0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -104,7 +104,8 @@
MdcEquipment mdcEquipment = new MdcEquipment();
mdcEquipment.setEquipmentId(entity.getEquipmentCode());
mdcEquipment.setEquipmentType(entity.getDeviceType());
- mdcEquipment.setEquipmentName(entity.getEquipmentName());
+ mdcEquipment.setEquipmentName(entity.getInstallationPosition());
+ mdcEquipment.setEquipmentAddress(entity.getEquipmentName());
mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
}
return Result.OK("娣诲姞鎴愬姛锛�");
@@ -275,7 +276,8 @@
MdcEquipment mdcEquipment = new MdcEquipment();
mdcEquipment.setEquipmentId(eamEquipment.getEquipmentCode());
mdcEquipment.setEquipmentType(eamEquipment.getDeviceType());
- mdcEquipment.setEquipmentName(eamEquipment.getEquipmentName());
+ mdcEquipment.setEquipmentName(eamEquipment.getInstallationPosition());
+ mdcEquipment.setEquipmentAddress(eamEquipment.getEquipmentName());
mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
}
}
--
Gitblit v1.9.3