From 326d21b896b6a3f2644a92829a96f5db38fb9560 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 17 六月 2025 10:18:48 +0800
Subject: [PATCH] fix(eims): 优化设备导入功能
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
index 7f9b90c..bf9b051 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
@@ -87,10 +87,17 @@
e.printStackTrace();
}
}
+ // 濡傛灉璧勪骇缂栧彿涓虹┖鍒欒烦杩囨鏉℃暟鎹�
+ if (StringUtils.isEmpty(equVo.getAssetNo())) {
+ return;
+ }
+
+ EimsEquBo equ = BeanUtil.toBean(equVo, EimsEquBo.class);
+ equ.setStatus(dictService.getDictValue(DictConstants.EIMS_EQU_STATUS,"姝ｅ父"));
// 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
if (ObjectUtil.isNull(eimsEquVo)) {
- EimsEquBo equ = BeanUtil.toBean(equVo, EimsEquBo.class);
+
// TODO 鏍￠獙
//ValidatorUtils.validate(equ);
@@ -101,9 +108,12 @@
successNum++;
successMsg.append("<br/>").append(successNum).append("銆佽澶� ").append(equ.getEquName()).append(" 瀵煎叆鎴愬姛");
} else if (isUpdateSupport) {
+ equ.setEquId(eimsEquVo.getEquId());
+ equService.updateByBo(equ);
+ equ.setImportStatus(dictService.getDictValue(DictConstants.EIMS_IMPORT_STATUS,"鏇存柊"));
// TODO 鎵ц瑕嗙洊閫昏緫
- //successNum++;
- //successMsg.append("<br/>").append(successNum).append("銆佽澶� ").append(equ.getEquName()).append(" 鏇存柊鎴愬姛");
+ successNum++;
+ successMsg.append("<br/>").append(successNum).append("銆佽澶� ").append(equ.getEquName()).append(" 鏇存柊鎴愬姛");
} else {
failureNum++;
failureMsg.append("<br/>").append(failureNum).append("銆佽澶� ").append(eimsEquVo.getEquName()).append(eimsEquVo.getAssetNo()).append(" 宸插瓨鍦�");
--
Gitblit v1.9.3