From 6e3d8e950e7dec3551bee3512673e1fc2d384d2b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 20:25:55 +0800
Subject: [PATCH] fix(mes): 修复能耗抄表控制器启动时的 bean 名称冲突
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java
index 288ea62..dadf923 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageService.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mes.service.wm.packages;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackagePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageDO;
@@ -11,7 +13,7 @@
/**
* MES 瑁呯鍗� Service 鎺ュ彛
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
public interface MesWmPackageService {
@@ -91,4 +93,13 @@
*/
List<Long> getPackageAndDescendantIds(Long packageId);
+ /**
+ * 瀵煎叆瑁呯鍗�
+ *
+ * @param importList 瀵煎叆鍒楄〃
+ * @param updateSupport 鏄惁鏀寔鏇存柊锛岄粯璁や负 false
+ * @return 瀵煎叆缁撴灉
+ */
+ MesWmPackageImportRespVO importPackageList(List<MesWmPackageImportExcelVO> importList, boolean updateSupport);
+
}
--
Gitblit v1.9.3