From 89b8f1af78b6fbe8c8a4a01053e4c75b48bc67d9 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 17:27:10 +0800
Subject: [PATCH] 修改

---
 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