From 85b59e81e95b8949099e74fe041010bed8c8fc5f Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 6 May 2026 10:27:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(wcs):=20=E6=B7=BB=E5=8A=A0WCS=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6=E4=B8=9A=E5=8A=A1=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=8F=8A=E4=BC=98=E5=8C=96=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加hw-wcs模块到ruoyi-admin的依赖中，确保能注册相关Controller和资源端点
- 在pom.xml的dependencyManagement中统一声明版本
- 优化WcsSubtaskInstanceServiceImpl的导入顺序
---
 .claude/settings.local.json                    |  8 ++++++++
 .editorconfig                                  | 18 ++++++++++++++++++
 .../impl/WcsSubtaskInstanceServiceImpl.java    | 16 ++++++++--------
 pom.xml                                        |  8 +++++++-
 ruoyi-admin/pom.xml                            |  6 ++++++
 5 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 .claude/settings.local.json
 create mode 100644 .editorconfig

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
new file mode 100644
index 0000000..9a18865
--- /dev/null
+++ b/.claude/settings.local.json
@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(ls:*)",
+      "Bash(mvn --version)"
+    ]
+  }
+}
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..25b312e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+# http://editorconfig.org
+root = true
+
+# 空格替代Tab缩进在各种编辑工具下效果一致
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{json,yml,yaml}]
+indent_size = 2
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/hw-wcs/src/main/java/org/dromara/wcs/service/impl/WcsSubtaskInstanceServiceImpl.java b/hw-wcs/src/main/java/org/dromara/wcs/service/impl/WcsSubtaskInstanceServiceImpl.java
index 97f2d4e..d5a1930 100644
--- a/hw-wcs/src/main/java/org/dromara/wcs/service/impl/WcsSubtaskInstanceServiceImpl.java
+++ b/hw-wcs/src/main/java/org/dromara/wcs/service/impl/WcsSubtaskInstanceServiceImpl.java
@@ -1,24 +1,24 @@
 package org.dromara.wcs.service.impl;
 
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.wcs.domain.WcsSubtaskInstance;
 import org.dromara.wcs.domain.bo.WcsSubtaskInstanceBo;
 import org.dromara.wcs.domain.vo.WcsSubtaskInstanceVo;
-import org.dromara.wcs.domain.WcsSubtaskInstance;
 import org.dromara.wcs.mapper.WcsSubtaskInstanceMapper;
 import org.dromara.wcs.service.IWcsSubtaskInstanceService;
+import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * agv任务Service业务层处理
diff --git a/pom.xml b/pom.xml
index d0e0f0c..555a523 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,6 +357,13 @@
                 <version>${revision}</version>
             </dependency>
 
+            <!-- WCS定制业务模块：仅聚合构建不会进入启动应用classpath，需统一声明版本供ruoyi-admin显式引用 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>hw-wcs</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -497,4 +504,3 @@
 
 </project>
 
-
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 9e97804..f663a51 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -93,6 +93,12 @@
             <artifactId>ruoyi-workflow</artifactId>
         </dependency>
 
+        <!-- WCS定制业务模块：启动应用必须显式依赖，才能注册/wcs/** Controller 与相关资源端点 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hw-wcs</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>