From 5c237cc196cc7a9449dc988faa5fcf3994d31df7 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 7 May 2026 10:16:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(wcs):=20=E9=9B=86=E6=88=90WCS=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=B9=B6=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在pom.xml和ruoyi-admin中新增hw-wcs依赖
- 修改redisson客户端名称为haiwei-Vue-Plus
- 调整mybatis-plus主键生成策略为ASSIGN_ID
- 在springdoc配置中新增WCS模块扫描路径
- 优化hw-wcs模块的依赖结构
---
 pom.xml                                       |  7 +++
 ruoyi-admin/pom.xml                           |  6 ++
 .../src/main/resources/application-dev.yml    |  2 +-
 .../src/main/resources/application.yml        |  4 +-
 ruoyi-modules/hw-wcs/pom.xml                  | 55 ++++++++++---------
 5 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52ad33d..0e2cf50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,6 +357,13 @@
                 <version>${revision}</version>
             </dependency>
 
+            <!--  WCS WMS业务模块  -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>hw-wcs</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 9e97804..77b1adb 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -93,6 +93,12 @@
             <artifactId>ruoyi-workflow</artifactId>
         </dependency>
 
+        <!--  WCS WMS业务模块  -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hw-wcs</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 0f6f4c5..e26b263 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -126,7 +126,7 @@ redisson:
   # 单节点配置
   singleServerConfig:
     # 客户端名称 不能用中文
-    clientName: RuoYi-Vue-Plus
+    clientName: haiwei-Vue-Plus
     # 最小空闲连接数
     connectionMinimumIdleSize: 8
     # 连接池大小
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b82fc9a..e08245e 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -150,7 +150,7 @@ mybatis-plus:
       # 主键类型
       # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
       # 如需改为自增 需要将数据库表全部设置为自增
-      idType: AUTO
+      idType: ASSIGN_ID
 
 # 数据加密
 mybatis-encryptor:
@@ -207,6 +207,8 @@ springdoc:
       packages-to-scan: org.dromara.generator
     - group: 5.工作流模块
       packages-to-scan: org.dromara.workflow
+    - group: 6.WCS模块
+      packages-to-scan: org.dromara.wcs
 
 # 防止XSS攻击
 xss:
diff --git a/ruoyi-modules/hw-wcs/pom.xml b/ruoyi-modules/hw-wcs/pom.xml
index 88edba9..3190d06 100644
--- a/ruoyi-modules/hw-wcs/pom.xml
+++ b/ruoyi-modules/hw-wcs/pom.xml
@@ -16,6 +16,7 @@
     </description>
 
     <dependencies>
+
         <!-- 通用工具-->
         <dependency>
             <groupId>org.dromara</groupId>
@@ -27,44 +28,41 @@
             <artifactId>ruoyi-common-doc</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-mybatis</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-translation</artifactId>
-        </dependency>
-
-        <!-- OSS功能模块 -->
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-oss</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-log</artifactId>
         </dependency>
 
-        <!-- excel-->
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-excel</artifactId>
         </dependency>
 
-        <!-- SMS功能模块 -->
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-sms</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-tenant</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-security</artifactId>
@@ -77,7 +75,12 @@
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-idempotent</artifactId>
+            <artifactId>ruoyi-common-ratelimiter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
         </dependency>
 
         <dependency>
@@ -92,12 +95,12 @@
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-websocket</artifactId>
+            <artifactId>ruoyi-common-tenant</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-sse</artifactId>
+            <artifactId>ruoyi-common-websocket</artifactId>
         </dependency>
 
     </dependencies>