From 1337e62c126ddb7eb1088c4d81a721cf7cc2d7c4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 16 七月 2025 17:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 15 +++++++++++++--
1 files changed, 13 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 400264b..f6ee810 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
@@ -26,8 +26,6 @@
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.eam.vo.EquipmentSearchResult;
-//import org.jeecg.modules.mdc.entity.MdcEquipment;
-//import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.service.IBaseFactoryService;
@@ -230,6 +228,19 @@
equipmentList.forEach(item -> {
EamEquipmentDto eamEquipmentDto = new EamEquipmentDto();
BeanUtils.copyProperties(item,eamEquipmentDto);
+ if (eamEquipmentDto.getFactoryOrgCode().length()==12){
+ eamEquipmentDto.setFactoryOrgCode(
+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getZxfactoryOrgCode())
+ +"/"+baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getGqfactoryOrgCode())+"/"+
+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getFactoryOrgCode()));
+ }else {
+ eamEquipmentDto.setFactoryOrgCode(
+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getZxfactoryOrgCode())
+ +"/"+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getFactoryOrgCode()));
+ }
+ if (eamEquipmentDto.getEquipmentWeight()!=null){
+ eamEquipmentDto.setEquipmentWeightStr(eamEquipmentDto.getEquipmentWeight().toEngineeringString());
+ }
eamEquipmentDtos.add(eamEquipmentDto);
});
// Step.3 AutoPoi 瀵煎嚭Excel
--
Gitblit v1.9.3