From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +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, 14 insertions(+), 1 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 a2233c6..400264b 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
@@ -29,7 +29,9 @@
//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;
+import org.jeecg.modules.system.service.IEamBaseRepairDepartService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -77,7 +79,8 @@
private TranslateDictTextUtils translateDictTextUtils;
@Autowired
private IBaseFactoryService baseFactoryService;
-
+ @Autowired
+ private IEamBaseRepairDepartService eamBaseRepairDepartService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -287,12 +290,22 @@
}else {
eamEquipment.setFactoryOrgCode(baseFactory.getOrgCode());
}
+ EamBaseRepairDepart eamBaseRepairDepart=eamBaseRepairDepartService.searchCenterByKeyWord(eamEquipment.getRepairDepartOrgCode());
+ if(eamBaseRepairDepart==null){
+ sb.append(String.format("缁翠慨鐝粍淇℃伅[%s]涓嶅瓨鍦紝鏃犳硶瀵煎叆\n\r", eamEquipment.getRepairDepartOrgCode()));
+ continue;
+ }else {
+ eamEquipment.setRepairDepartOrgCode(eamBaseRepairDepart.getOrgCode());
+ }
EamEquipment equipment = eamEquipmentService.saveEquipment(eamEquipment);
if (equipment == null) {
//淇濆瓨澶辫触锛岃烦杩囨湰娆″惊鐜�
sb.append(String.format("璁惧缂栫爜[%s]淇濆瓨澶辫触锛屾棤娉曞鍏n\r", eamEquipment.getEquipmentCode()));
continue;
}
+ EamEquipmentExtend eamEquipmentExtend=new EamEquipmentExtend();
+ BeanUtils.copyProperties(eamEquipmentExtend,equipment);
+ eamEquipmentExtendService.save(eamEquipmentExtend);
}
log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
//update-end-author:taoyan date:20190528 for:鎵归噺鎻掑叆鏁版嵁
--
Gitblit v1.9.3