From 924f3df0232e8de51a745f8faa8b2029c09a52d5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 17:27:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 65995b2..bd7f285 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -560,6 +560,10 @@
EamMaintenanceStandard eamMaintenanceStandard = extractDeviceInfo(sheet);
if (eamMaintenanceStandard == null) {
return Result.error("璁惧淇℃伅鎻愬彇澶辫触");
+ }else {
+ if (eamMaintenanceStandard.getEquipmentId() == null) {
+ return Result.error("璁惧淇℃伅鎻愬彇澶辫触");
+ }
}
eamMaintenanceStandard.setStandardName(name);
@@ -646,6 +650,7 @@
EamMaintenanceStandard standard = new EamMaintenanceStandard();
standard.setEquipmentName(extractField(headerText, "璁惧鍚嶇О[:锛歖\\s*(\\S+)"));
+ standard.setEquipmentCode(extractField(headerText, "缁熶竴缂栧彿[:锛歖\\s*(\\S+)"));
// 鏃ユ湡澶勭悊
--
Gitblit v1.9.3