diff --git a/pom.xml b/pom.xml
index c0e772b..b155e90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,7 +330,7 @@
     </dependencyManagement>
 
     <modules>
-        <module>ruoyi-admin</module>
+        <module>ruoyi-admin-wms</module>
         <module>ruoyi-common</module>
         <module>ruoyi-modules</module>
     </modules>
diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin-wms/Dockerfile
similarity index 100%
rename from ruoyi-admin/Dockerfile
rename to ruoyi-admin-wms/Dockerfile
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin-wms/pom.xml
similarity index 95%
rename from ruoyi-admin/pom.xml
rename to ruoyi-admin-wms/pom.xml
index 3d7c30c..4c74b6c 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin-wms/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>ruoyi-admin-wms</artifactId>
 
     <description>
         web服务入口
@@ -62,11 +62,6 @@
             <artifactId>ruoyi-demo</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-wms-service</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/RuoYiApplication.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/RuoYiApplication.java
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/RuoYiServletInitializer.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/RuoYiServletInitializer.java
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/AreaController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/AreaController.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/AreaController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/AreaController.java
index 2d6c704..9ec86a7 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/AreaController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/AreaController.java
@@ -15,7 +15,6 @@ import com.ruoyi.wms.domain.bo.AreaBo;
 import com.ruoyi.wms.domain.vo.AreaVo;
 import com.ruoyi.wms.service.AreaService;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/InventoryController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/InventoryController.java
similarity index 97%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/InventoryController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/InventoryController.java
index 5d98943..16a2e0e 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/InventoryController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/InventoryController.java
@@ -1,26 +1,27 @@
 package com.ruoyi.wms.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.excel.utils.ExcelUtil;
-import com.ruoyi.wms.domain.vo.InventoryVo;
-import com.ruoyi.wms.domain.bo.InventoryBo;
-import com.ruoyi.wms.service.InventoryService;
+import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.web.core.BaseController;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.wms.domain.bo.InventoryBo;
+import com.ruoyi.wms.domain.vo.InventoryVo;
+import com.ruoyi.wms.service.InventoryService;
+
+import java.util.List;
 
 /**
  * 库存
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/InventoryDetailController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/InventoryDetailController.java
similarity index 97%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/InventoryDetailController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/InventoryDetailController.java
index 431f26f..111e73c 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/InventoryDetailController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/InventoryDetailController.java
@@ -1,26 +1,27 @@
 package com.ruoyi.wms.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.excel.utils.ExcelUtil;
-import com.ruoyi.wms.domain.vo.InventoryDetailVo;
-import com.ruoyi.wms.domain.bo.InventoryDetailBo;
-import com.ruoyi.wms.service.InventoryDetailService;
+import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.web.core.BaseController;
+import com.ruoyi.wms.domain.vo.InventoryDetailVo;
+import com.ruoyi.wms.service.InventoryDetailService;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.wms.domain.bo.InventoryDetailBo;
+
+import java.util.List;
 
 /**
  * 库存详情
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/InventoryHistoryController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/InventoryHistoryController.java
similarity index 97%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/InventoryHistoryController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/InventoryHistoryController.java
index 4a8f943..a27dd68 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/InventoryHistoryController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/InventoryHistoryController.java
@@ -1,26 +1,27 @@
 package com.ruoyi.wms.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.excel.utils.ExcelUtil;
-import com.ruoyi.wms.domain.vo.InventoryHistoryVo;
-import com.ruoyi.wms.domain.bo.InventoryHistoryBo;
-import com.ruoyi.wms.service.InventoryHistoryService;
+import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.web.core.BaseController;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.wms.domain.bo.InventoryHistoryBo;
+import com.ruoyi.wms.domain.vo.InventoryHistoryVo;
+import com.ruoyi.wms.service.InventoryHistoryService;
+
+import java.util.List;
 
 /**
  * 库存记录
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ItemCategoryController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ItemCategoryController.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ItemCategoryController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ItemCategoryController.java
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ItemController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ItemController.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ItemController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ItemController.java
index 8a05a79..1d7f34b 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ItemController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ItemController.java
@@ -10,15 +10,14 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.wms.domain.bo.ItemBo;
-import com.ruoyi.wms.domain.vo.ItemVo;
-import com.ruoyi.wms.service.ItemService;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import com.ruoyi.wms.domain.bo.ItemBo;
+import com.ruoyi.wms.domain.vo.ItemVo;
+import com.ruoyi.wms.service.ItemService;
 
 import java.util.List;
 
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ItemSkuController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ItemSkuController.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ItemSkuController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ItemSkuController.java
index aa00e08..da75b2a 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ItemSkuController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ItemSkuController.java
@@ -14,7 +14,6 @@ import com.ruoyi.wms.domain.bo.ItemSkuBo;
 import com.ruoyi.wms.domain.vo.ItemSkuVo;
 import com.ruoyi.wms.service.ItemSkuService;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/MerchantController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/MerchantController.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/MerchantController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/MerchantController.java
index b20bd49..32019eb 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/MerchantController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/MerchantController.java
@@ -11,15 +11,14 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.wms.domain.bo.MerchantBo;
 import com.ruoyi.wms.domain.vo.MerchantVo;
-import com.ruoyi.wms.service.MerchantService;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import com.ruoyi.wms.domain.bo.MerchantBo;
+import com.ruoyi.wms.service.MerchantService;
 
 import java.util.List;
 
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ReceiptOrderController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ReceiptOrderController.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ReceiptOrderController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ReceiptOrderController.java
index 6397856..c25010f 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ReceiptOrderController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ReceiptOrderController.java
@@ -1,27 +1,27 @@
 package com.ruoyi.wms.controller;
 
-import java.util.List;
-
-import com.ruoyi.common.core.constant.ServiceConstants;
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.core.constant.ServiceConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.excel.utils.ExcelUtil;
-import com.ruoyi.wms.domain.vo.ReceiptOrderVo;
-import com.ruoyi.wms.domain.bo.ReceiptOrderBo;
-import com.ruoyi.wms.service.ReceiptOrderService;
+import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.web.core.BaseController;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.wms.domain.bo.ReceiptOrderBo;
+import com.ruoyi.wms.domain.vo.ReceiptOrderVo;
+import com.ruoyi.wms.service.ReceiptOrderService;
+
+import java.util.List;
 
 /**
  * 入库单
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ReceiptOrderDetailController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ReceiptOrderDetailController.java
similarity index 97%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ReceiptOrderDetailController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ReceiptOrderDetailController.java
index 136e680..7ead030 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/ReceiptOrderDetailController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ReceiptOrderDetailController.java
@@ -1,26 +1,27 @@
 package com.ruoyi.wms.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.excel.utils.ExcelUtil;
-import com.ruoyi.wms.domain.vo.ReceiptOrderDetailVo;
-import com.ruoyi.wms.domain.bo.ReceiptOrderDetailBo;
-import com.ruoyi.wms.service.ReceiptOrderDetailService;
+import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.web.core.BaseController;
+import com.ruoyi.wms.domain.bo.ReceiptOrderDetailBo;
+import com.ruoyi.wms.domain.vo.ReceiptOrderDetailVo;
+import com.ruoyi.wms.service.ReceiptOrderDetailService;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 入库单详情
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/WarehouseController.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/WarehouseController.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/WarehouseController.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/WarehouseController.java
index 290cc27..030d3a1 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/controller/WarehouseController.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/WarehouseController.java
@@ -11,15 +11,14 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.wms.domain.bo.WarehouseBo;
-import com.ruoyi.wms.domain.vo.WarehouseVo;
 import com.ruoyi.wms.service.WarehouseService;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import com.ruoyi.wms.domain.bo.WarehouseBo;
+import com.ruoyi.wms.domain.vo.WarehouseVo;
 
 import java.util.List;
 
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/AreaBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/AreaBo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/AreaBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/AreaBo.java
index dd859ee..f391266 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/AreaBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/AreaBo.java
@@ -3,12 +3,12 @@ package com.ruoyi.wms.domain.bo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
-import com.ruoyi.wms.domain.entity.Area;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import com.ruoyi.wms.domain.entity.Area;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/InventoryBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryBo.java
similarity index 93%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/InventoryBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryBo.java
index f9a517d..83e949b 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/InventoryBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryBo.java
@@ -1,13 +1,14 @@
 package com.ruoyi.wms.domain.bo;
 
-import com.ruoyi.wms.domain.entity.Inventory;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import com.ruoyi.wms.domain.entity.Inventory;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import io.github.linpeilie.annotations.AutoMapper;
 
 import java.math.BigDecimal;
 
@@ -24,7 +25,7 @@ import java.math.BigDecimal;
 public class InventoryBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/InventoryDetailBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryDetailBo.java
similarity index 96%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/InventoryDetailBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryDetailBo.java
index f94d86a..70132e4 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/InventoryDetailBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryDetailBo.java
@@ -1,18 +1,17 @@
 package com.ruoyi.wms.domain.bo;
 
-import com.ruoyi.wms.domain.entity.InventoryDetail;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import com.ruoyi.wms.domain.entity.InventoryDetail;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import io.github.linpeilie.annotations.AutoMapper;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 库存详情业务对象 wms_inventory_detail
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/InventoryHistoryBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryHistoryBo.java
similarity index 95%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/InventoryHistoryBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryHistoryBo.java
index dcc5622..ec3d776 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/InventoryHistoryBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/InventoryHistoryBo.java
@@ -1,13 +1,14 @@
 package com.ruoyi.wms.domain.bo;
 
-import com.ruoyi.wms.domain.entity.InventoryHistory;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import io.github.linpeilie.annotations.AutoMapper;
+import com.ruoyi.wms.domain.entity.InventoryHistory;
 
 import java.math.BigDecimal;
 
@@ -24,7 +25,7 @@ import java.math.BigDecimal;
 public class InventoryHistoryBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ItemBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ItemBo.java
similarity index 97%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ItemBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ItemBo.java
index d1712e9..292da84 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ItemBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ItemBo.java
@@ -4,7 +4,6 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import com.ruoyi.wms.domain.entity.Item;
-import com.ruoyi.wms.domain.vo.ItemSkuVo;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ItemCategoryBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ItemCategoryBo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ItemCategoryBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ItemCategoryBo.java
index a65fa97..d0edf1a 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ItemCategoryBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ItemCategoryBo.java
@@ -3,12 +3,12 @@ package com.ruoyi.wms.domain.bo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
-import com.ruoyi.wms.domain.entity.ItemCategory;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import com.ruoyi.wms.domain.entity.ItemCategory;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ItemSkuBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ItemSkuBo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ItemSkuBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ItemSkuBo.java
index c212bd8..14d0676 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ItemSkuBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ItemSkuBo.java
@@ -3,12 +3,12 @@ package com.ruoyi.wms.domain.bo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
-import com.ruoyi.wms.domain.entity.ItemSku;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import com.ruoyi.wms.domain.entity.ItemSku;
 
 import java.math.BigDecimal;
 
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/MerchantBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/MerchantBo.java
similarity index 94%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/MerchantBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/MerchantBo.java
index 60ff074..496a6d2 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/MerchantBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/MerchantBo.java
@@ -1,13 +1,14 @@
 package com.ruoyi.wms.domain.bo;
 
-import com.ruoyi.wms.domain.entity.Merchant;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import com.ruoyi.wms.domain.entity.Merchant;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import io.github.linpeilie.annotations.AutoMapper;
 
 
 /**
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderBo.java
similarity index 91%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderBo.java
index 053f492..fb21211 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderBo.java
@@ -1,13 +1,15 @@
 package com.ruoyi.wms.domain.bo;
 
-import com.ruoyi.wms.domain.entity.ReceiptOrder;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import com.ruoyi.wms.domain.entity.ReceiptOrder;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import io.github.linpeilie.annotations.AutoMapper;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderDetailBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderDetailBo.java
similarity index 95%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderDetailBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderDetailBo.java
index 75648c7..866fe92 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderDetailBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/ReceiptOrderDetailBo.java
@@ -1,13 +1,14 @@
 package com.ruoyi.wms.domain.bo;
 
-import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import io.github.linpeilie.annotations.AutoMapper;
+import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/WarehouseBo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/WarehouseBo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/WarehouseBo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/WarehouseBo.java
index eb75032..5440626 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/bo/WarehouseBo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/bo/WarehouseBo.java
@@ -3,12 +3,12 @@ package com.ruoyi.wms.domain.bo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
-import com.ruoyi.wms.domain.entity.Warehouse;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import com.ruoyi.wms.domain.entity.Warehouse;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Area.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Area.java
similarity index 93%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Area.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Area.java
index 07032a6..eaf0361 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Area.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Area.java
@@ -1,7 +1,6 @@
 package com.ruoyi.wms.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Inventory.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Inventory.java
similarity index 88%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Inventory.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Inventory.java
index 358253d..fdcf719 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Inventory.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Inventory.java
@@ -1,13 +1,13 @@
 package com.ruoyi.wms.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 库存对象 wms_inventory
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/InventoryDetail.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/InventoryDetail.java
similarity index 92%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/InventoryDetail.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/InventoryDetail.java
index ce76ca0..ebd5888 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/InventoryDetail.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/InventoryDetail.java
@@ -1,16 +1,14 @@
 package com.ruoyi.wms.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serial;
 
 /**
  * 库存详情对象 wms_inventory_detail
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/InventoryHistory.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/InventoryHistory.java
similarity index 90%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/InventoryHistory.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/InventoryHistory.java
index 45c9ac4..75dfd79 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/InventoryHistory.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/InventoryHistory.java
@@ -1,13 +1,13 @@
 package com.ruoyi.wms.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 库存记录对象 wms_inventory_history
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Item.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Item.java
similarity index 94%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Item.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Item.java
index 9435ce9..0e4ff36 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Item.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Item.java
@@ -1,7 +1,6 @@
 package com.ruoyi.wms.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ItemCategory.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ItemCategory.java
similarity index 93%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ItemCategory.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ItemCategory.java
index 6d0fb81..651f429 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ItemCategory.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ItemCategory.java
@@ -1,7 +1,6 @@
 package com.ruoyi.wms.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ItemSku.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ItemSku.java
similarity index 92%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ItemSku.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ItemSku.java
index 6d29a84..84afa4a 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ItemSku.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ItemSku.java
@@ -1,7 +1,6 @@
 package com.ruoyi.wms.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
@@ -9,7 +8,6 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.math.BigDecimal;
-import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Merchant.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Merchant.java
similarity index 96%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Merchant.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Merchant.java
index 4d93984..30ef5e6 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Merchant.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Merchant.java
@@ -1,7 +1,6 @@
 package com.ruoyi.wms.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrder.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrder.java
similarity index 90%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrder.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrder.java
index 7bd7ece..bf3aded 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrder.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrder.java
@@ -1,13 +1,13 @@
 package com.ruoyi.wms.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 入库单对象 wms_receipt_order
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrderDetail.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrderDetail.java
similarity index 91%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrderDetail.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrderDetail.java
index 5c76624..e735ee0 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrderDetail.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/ReceiptOrderDetail.java
@@ -1,13 +1,13 @@
 package com.ruoyi.wms.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 import java.io.Serial;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Warehouse.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Warehouse.java
similarity index 93%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Warehouse.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Warehouse.java
index 1e72490..7ea220e 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/entity/Warehouse.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/entity/Warehouse.java
@@ -1,7 +1,6 @@
 package com.ruoyi.wms.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/AreaVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/AreaVo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/AreaVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/AreaVo.java
index 64568a0..b0edcc2 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/AreaVo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/AreaVo.java
@@ -2,9 +2,9 @@ package com.ruoyi.wms.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.wms.domain.entity.Area;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import com.ruoyi.wms.domain.entity.Area;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/InventoryDetailVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/InventoryDetailVo.java
similarity index 91%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/InventoryDetailVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/InventoryDetailVo.java
index 5279411..77b18cb 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/InventoryDetailVo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/InventoryDetailVo.java
@@ -1,19 +1,15 @@
 package com.ruoyi.wms.domain.vo;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.wms.domain.entity.InventoryDetail;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.excel.annotation.ExcelDictFormat;
-import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import lombok.Data;
 import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import com.ruoyi.wms.domain.entity.InventoryDetail;
 
-import java.io.Serializable;
 import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * 库存详情视图对象 wms_inventory_detail
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/InventoryHistoryVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/InventoryHistoryVo.java
similarity index 99%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/InventoryHistoryVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/InventoryHistoryVo.java
index 238b470..5ca39e9 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/InventoryHistoryVo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/InventoryHistoryVo.java
@@ -1,16 +1,16 @@
 package com.ruoyi.wms.domain.vo;
 
-import java.math.BigDecimal;
-import com.ruoyi.wms.domain.entity.InventoryHistory;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import lombok.Data;
+import com.ruoyi.wms.domain.entity.InventoryHistory;
 import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
 
-import java.io.Serializable;
 import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 库存记录视图对象 wms_inventory_history
@@ -27,7 +27,7 @@ public class InventoryHistoryVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private Long id;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/InventoryVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/InventoryVo.java
similarity index 90%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/InventoryVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/InventoryVo.java
index d72e9d3..8def68e 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/InventoryVo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/InventoryVo.java
@@ -1,16 +1,14 @@
 package com.ruoyi.wms.domain.vo;
 
-import java.math.BigDecimal;
-import com.ruoyi.wms.domain.entity.Inventory;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.excel.annotation.ExcelDictFormat;
-import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import lombok.Data;
+import com.ruoyi.wms.domain.entity.Inventory;
 import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
 
-import java.io.Serializable;
 import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 库存视图对象 wms_inventory
@@ -27,7 +25,7 @@ public class InventoryVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private Long id;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemCategoryVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemCategoryVo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemCategoryVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemCategoryVo.java
index 37658ce..6e1de1f 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemCategoryVo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemCategoryVo.java
@@ -5,9 +5,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import com.ruoyi.wms.domain.entity.ItemCategory;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import com.ruoyi.wms.domain.entity.ItemCategory;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemSkuVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemSkuVo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemSkuVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemSkuVo.java
index 1275889..be581bf 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemSkuVo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemSkuVo.java
@@ -2,9 +2,9 @@ package com.ruoyi.wms.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.wms.domain.entity.ItemSku;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import com.ruoyi.wms.domain.entity.ItemSku;
 
 import java.io.Serial;
 import java.io.Serializable;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemTypeTreeSelectVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemTypeTreeSelectVo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemTypeTreeSelectVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemTypeTreeSelectVo.java
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemVo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ItemVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ItemVo.java
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/MerchantVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/MerchantVo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/MerchantVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/MerchantVo.java
index ffbb10e..df83b4e 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/MerchantVo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/MerchantVo.java
@@ -1,15 +1,15 @@
 package com.ruoyi.wms.domain.vo;
 
-import com.ruoyi.wms.domain.entity.Merchant;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import lombok.Data;
 import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import com.ruoyi.wms.domain.entity.Merchant;
 
-import java.io.Serializable;
 import java.io.Serial;
+import java.io.Serializable;
 
 /**
  * 往来单位视图对象 wms_merchant
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderDetailVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderDetailVo.java
similarity index 93%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderDetailVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderDetailVo.java
index 89e39bf..0b58586 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderDetailVo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderDetailVo.java
@@ -1,16 +1,14 @@
 package com.ruoyi.wms.domain.vo;
 
-import java.math.BigDecimal;
-import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.excel.annotation.ExcelDictFormat;
-import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import lombok.Data;
 import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
 
-import java.io.Serializable;
 import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderVo.java
similarity index 93%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderVo.java
index 791e125..c4fa777 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderVo.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/ReceiptOrderVo.java
@@ -1,18 +1,15 @@
 package com.ruoyi.wms.domain.vo;
 
-import java.math.BigDecimal;
-
-import com.ruoyi.common.mybatis.core.domain.BaseEntity;
-import com.ruoyi.wms.domain.entity.ReceiptOrder;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.excel.annotation.ExcelDictFormat;
-import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import lombok.Data;
+import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import com.ruoyi.wms.domain.entity.ReceiptOrder;
 import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
 
-import java.io.Serializable;
 import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/WarehouseVo.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/WarehouseVo.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/domain/vo/WarehouseVo.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/domain/vo/WarehouseVo.java
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/AreaMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/AreaMapper.java
similarity index 71%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/AreaMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/AreaMapper.java
index f67e628..3a48d46 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/AreaMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/AreaMapper.java
@@ -1,12 +1,8 @@
 package com.ruoyi.wms.mapper;
 
 import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
-import com.ruoyi.wms.domain.entity.Area;
 import com.ruoyi.wms.domain.vo.AreaVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Collection;
-import java.util.List;
+import com.ruoyi.wms.domain.entity.Area;
 
 public interface AreaMapper extends BaseMapperPlus<Area, AreaVo> {
 }
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/InventoryDetailMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/InventoryDetailMapper.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/InventoryDetailMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/InventoryDetailMapper.java
index 9d058dc..79d5eca 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/InventoryDetailMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/InventoryDetailMapper.java
@@ -1,8 +1,8 @@
 package com.ruoyi.wms.mapper;
 
+import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 import com.ruoyi.wms.domain.entity.InventoryDetail;
 import com.ruoyi.wms.domain.vo.InventoryDetailVo;
-import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
  * 库存详情Mapper接口
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/InventoryHistoryMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/InventoryHistoryMapper.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/InventoryHistoryMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/InventoryHistoryMapper.java
index e48c2ce..2a938ac 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/InventoryHistoryMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/InventoryHistoryMapper.java
@@ -1,8 +1,8 @@
 package com.ruoyi.wms.mapper;
 
+import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 import com.ruoyi.wms.domain.entity.InventoryHistory;
 import com.ruoyi.wms.domain.vo.InventoryHistoryVo;
-import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
  * 库存记录Mapper接口
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/InventoryMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/InventoryMapper.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/InventoryMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/InventoryMapper.java
index 5469664..c00883d 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/InventoryMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/InventoryMapper.java
@@ -1,9 +1,9 @@
 package com.ruoyi.wms.mapper;
 
-import com.ruoyi.wms.domain.entity.Inventory;
-import com.ruoyi.wms.domain.vo.InventoryVo;
 import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
+import com.ruoyi.wms.domain.entity.Inventory;
 import org.apache.ibatis.annotations.Param;
+import com.ruoyi.wms.domain.vo.InventoryVo;
 
 import java.time.LocalDateTime;
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ItemCategoryMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ItemCategoryMapper.java
similarity index 80%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ItemCategoryMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ItemCategoryMapper.java
index ef2901d..81421e3 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ItemCategoryMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ItemCategoryMapper.java
@@ -3,9 +3,6 @@ package com.ruoyi.wms.mapper;
 import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 import com.ruoyi.wms.domain.entity.ItemCategory;
 import com.ruoyi.wms.domain.vo.ItemCategoryVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 public interface ItemCategoryMapper extends BaseMapperPlus<ItemCategory, ItemCategoryVo> {
 }
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ItemMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ItemMapper.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ItemMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ItemMapper.java
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ItemSkuMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ItemSkuMapper.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ItemSkuMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ItemSkuMapper.java
index 41c6756..039e8e7 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ItemSkuMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ItemSkuMapper.java
@@ -2,10 +2,10 @@ package com.ruoyi.wms.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 import com.ruoyi.wms.domain.bo.ItemSkuBo;
 import com.ruoyi.wms.domain.entity.ItemSku;
 import com.ruoyi.wms.domain.vo.ItemSkuVo;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/MerchantMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/MerchantMapper.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/MerchantMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/MerchantMapper.java
index 19b5e04..0951632 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/MerchantMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/MerchantMapper.java
@@ -1,8 +1,8 @@
 package com.ruoyi.wms.mapper;
 
-import com.ruoyi.wms.domain.entity.Merchant;
-import com.ruoyi.wms.domain.vo.MerchantVo;
 import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
+import com.ruoyi.wms.domain.vo.MerchantVo;
+import com.ruoyi.wms.domain.entity.Merchant;
 
 /**
  * 往来单位Mapper接口
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderDetailMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderDetailMapper.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderDetailMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderDetailMapper.java
index 79cc12f..a3cf4e4 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderDetailMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderDetailMapper.java
@@ -1,9 +1,9 @@
 package com.ruoyi.wms.mapper;
 
-import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
-import com.ruoyi.wms.domain.vo.ReceiptOrderDetailVo;
 import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
+import com.ruoyi.wms.domain.vo.ReceiptOrderDetailVo;
 
 import java.util.List;
 
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderMapper.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderMapper.java
index 97a9206..7367fd2 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/ReceiptOrderMapper.java
@@ -1,8 +1,8 @@
 package com.ruoyi.wms.mapper;
 
+import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 import com.ruoyi.wms.domain.entity.ReceiptOrder;
 import com.ruoyi.wms.domain.vo.ReceiptOrderVo;
-import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
  * 入库单Mapper接口
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/WarehouseMapper.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseMapper.java
similarity index 50%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/WarehouseMapper.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseMapper.java
index 16a996f..232d389 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/mapper/WarehouseMapper.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseMapper.java
@@ -1,15 +1,8 @@
 package com.ruoyi.wms.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 import com.ruoyi.wms.domain.entity.Warehouse;
 import com.ruoyi.wms.domain.vo.WarehouseVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Collection;
-import java.util.List;
 
 public interface WarehouseMapper extends BaseMapperPlus<Warehouse, WarehouseVo> {
 }
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/AreaService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/AreaService.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/AreaService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/AreaService.java
index a44b9ac..bdd7905 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/AreaService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/AreaService.java
@@ -1,6 +1,5 @@
 package com.ruoyi.wms.service;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,15 +9,14 @@ import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.MapstructUtils;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.wms.domain.bo.AreaBo;
-import com.ruoyi.wms.domain.entity.Area;
 import com.ruoyi.wms.domain.vo.AreaVo;
-import com.ruoyi.wms.mapper.AreaMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import com.ruoyi.wms.domain.bo.AreaBo;
+import com.ruoyi.wms.domain.entity.Area;
+import com.ruoyi.wms.mapper.AreaMapper;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/InventoryDetailService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/InventoryDetailService.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/InventoryDetailService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/InventoryDetailService.java
index c6ebe04..491e9a3 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/InventoryDetailService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/InventoryDetailService.java
@@ -1,23 +1,23 @@
 package com.ruoyi.wms.service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.utils.MapstructUtils;
-import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.MapstructUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.wms.domain.bo.InventoryDetailBo;
-import com.ruoyi.wms.domain.vo.InventoryDetailVo;
 import com.ruoyi.wms.domain.entity.InventoryDetail;
+import com.ruoyi.wms.domain.vo.InventoryDetailVo;
 import com.ruoyi.wms.mapper.InventoryDetailMapper;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 库存详情Service业务层处理
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/InventoryHistoryService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/InventoryHistoryService.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/InventoryHistoryService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/InventoryHistoryService.java
index 3c44bf0..6d59163 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/InventoryHistoryService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/InventoryHistoryService.java
@@ -1,23 +1,22 @@
 package com.ruoyi.wms.service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.utils.MapstructUtils;
-import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.MapstructUtils;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.wms.domain.bo.InventoryHistoryBo;
+import com.ruoyi.wms.domain.entity.InventoryHistory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.ruoyi.wms.domain.bo.InventoryHistoryBo;
 import com.ruoyi.wms.domain.vo.InventoryHistoryVo;
-import com.ruoyi.wms.domain.entity.InventoryHistory;
 import com.ruoyi.wms.mapper.InventoryHistoryMapper;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 库存记录Service业务层处理
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/InventoryService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/InventoryService.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/InventoryService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/InventoryService.java
index 81734fc..7fdbc17 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/InventoryService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/InventoryService.java
@@ -1,26 +1,28 @@
 package com.ruoyi.wms.service;
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.utils.MapstructUtils;
-import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.MapstructUtils;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.common.satoken.utils.LoginHelper;
+import com.ruoyi.wms.domain.entity.Inventory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.wms.domain.bo.InventoryBo;
 import com.ruoyi.wms.domain.vo.InventoryVo;
-import com.ruoyi.wms.domain.entity.Inventory;
 import com.ruoyi.wms.mapper.InventoryMapper;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ItemCategoryService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ItemCategoryService.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ItemCategoryService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ItemCategoryService.java
index 126b7f1..662d999 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ItemCategoryService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ItemCategoryService.java
@@ -1,6 +1,5 @@
 package com.ruoyi.wms.service;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,14 +11,13 @@ import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.wms.domain.bo.ItemCategoryBo;
 import com.ruoyi.wms.domain.entity.Item;
-import com.ruoyi.wms.domain.entity.ItemCategory;
 import com.ruoyi.wms.domain.vo.ItemCategoryVo;
 import com.ruoyi.wms.domain.vo.ItemTypeTreeSelectVo;
 import com.ruoyi.wms.mapper.ItemCategoryMapper;
-import com.ruoyi.wms.mapper.ItemMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.wms.domain.entity.ItemCategory;
+import com.ruoyi.wms.mapper.ItemMapper;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ItemService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ItemService.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ItemService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ItemService.java
index 2d682f7..58461ed 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ItemService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ItemService.java
@@ -10,21 +10,21 @@ import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.MapstructUtils;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.wms.domain.bo.ItemBo;
 import com.ruoyi.wms.domain.bo.ItemSkuBo;
 import com.ruoyi.wms.domain.entity.Item;
-import com.ruoyi.wms.domain.entity.ItemCategory;
-import com.ruoyi.wms.domain.entity.ItemSku;
-import com.ruoyi.wms.domain.vo.ItemCategoryVo;
 import com.ruoyi.wms.domain.vo.ItemVo;
 import com.ruoyi.wms.mapper.ItemCategoryMapper;
-import com.ruoyi.wms.mapper.ItemMapper;
 import com.ruoyi.wms.mapper.ItemSkuMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.wms.domain.bo.ItemBo;
+import com.ruoyi.wms.domain.entity.ItemCategory;
+import com.ruoyi.wms.domain.entity.ItemSku;
+import com.ruoyi.wms.domain.vo.ItemCategoryVo;
+import com.ruoyi.wms.mapper.ItemMapper;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ItemSkuService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ItemSkuService.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ItemSkuService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ItemSkuService.java
index 811c81f..525b78a 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ItemSkuService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ItemSkuService.java
@@ -12,12 +12,6 @@ import com.ruoyi.common.core.exception.base.BaseException;
 import com.ruoyi.common.core.utils.MapstructUtils;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.wms.domain.bo.ItemSkuBo;
-import com.ruoyi.wms.domain.entity.ItemCategory;
-import com.ruoyi.wms.domain.entity.ItemSku;
-import com.ruoyi.wms.domain.vo.ItemSkuVo;
-import com.ruoyi.wms.domain.vo.ItemVo;
-import com.ruoyi.wms.mapper.ItemCategoryMapper;
 import com.ruoyi.wms.mapper.ItemSkuMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +19,12 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.wms.domain.bo.ItemSkuBo;
+import com.ruoyi.wms.domain.entity.ItemCategory;
+import com.ruoyi.wms.domain.entity.ItemSku;
+import com.ruoyi.wms.domain.vo.ItemSkuVo;
+import com.ruoyi.wms.domain.vo.ItemVo;
+import com.ruoyi.wms.mapper.ItemCategoryMapper;
 
 import java.util.*;
 import java.util.function.Function;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/MerchantService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/MerchantService.java
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/MerchantService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/MerchantService.java
index f8000ae..103e08d 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/MerchantService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/MerchantService.java
@@ -1,26 +1,26 @@
 package com.ruoyi.wms.service;
 
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.MapstructUtils;
-import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.MapstructUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.wms.domain.entity.Merchant;
 import com.ruoyi.wms.domain.entity.ReceiptOrder;
+import com.ruoyi.wms.domain.vo.MerchantVo;
+import com.ruoyi.wms.mapper.MerchantMapper;
 import com.ruoyi.wms.mapper.ReceiptOrderMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import com.ruoyi.wms.domain.bo.MerchantBo;
-import com.ruoyi.wms.domain.vo.MerchantVo;
-import com.ruoyi.wms.domain.entity.Merchant;
-import com.ruoyi.wms.mapper.MerchantMapper;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 往来单位Service业务层处理
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ReceiptOrderDetailService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ReceiptOrderDetailService.java
similarity index 97%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ReceiptOrderDetailService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ReceiptOrderDetailService.java
index ce5c682..8967ec5 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ReceiptOrderDetailService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ReceiptOrderDetailService.java
@@ -2,22 +2,20 @@ package com.ruoyi.wms.service;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.utils.MapstructUtils;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.wms.domain.bo.ReceiptOrderDetailBo;
-import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
-import com.ruoyi.wms.domain.vo.ReceiptOrderDetailVo;
 import com.ruoyi.wms.mapper.ReceiptOrderDetailMapper;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.wms.domain.entity.ReceiptOrderDetail;
+import com.ruoyi.wms.domain.vo.ReceiptOrderDetailVo;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ReceiptOrderService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ReceiptOrderService.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ReceiptOrderService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ReceiptOrderService.java
index ec395f4..7cc04c6 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/ReceiptOrderService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ReceiptOrderService.java
@@ -1,31 +1,30 @@
 package com.ruoyi.wms.service;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.ruoyi.common.core.constant.Constants;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.constant.ServiceConstants;
 import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.exception.base.BaseException;
 import com.ruoyi.common.core.utils.GenerateNoUtil;
 import com.ruoyi.common.core.utils.MapstructUtils;
-import com.ruoyi.common.mybatis.core.domain.BaseEntity;
-import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.core.utils.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.system.domain.vo.SysDictDataVo;
 import com.ruoyi.system.service.SysDictTypeService;
-import com.ruoyi.wms.domain.bo.*;
+import com.ruoyi.wms.domain.bo.ReceiptOrderBo;
+import com.ruoyi.wms.domain.bo.ReceiptOrderDetailBo;
 import com.ruoyi.wms.domain.entity.*;
+import com.ruoyi.wms.domain.vo.ReceiptOrderVo;
 import com.ruoyi.wms.mapper.ReceiptOrderDetailMapper;
+import com.ruoyi.wms.mapper.ReceiptOrderMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import com.ruoyi.wms.domain.vo.ReceiptOrderVo;
-import com.ruoyi.wms.mapper.ReceiptOrderMapper;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/WarehouseService.java b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/WarehouseService.java
similarity index 98%
rename from ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/WarehouseService.java
rename to ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/WarehouseService.java
index 7379032..3415543 100644
--- a/ruoyi-modules/ruoyi-wms-service/src/main/java/com/ruoyi/wms/service/WarehouseService.java
+++ b/ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/WarehouseService.java
@@ -10,17 +10,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.utils.MapstructUtils;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.wms.domain.bo.WarehouseBo;
 import com.ruoyi.wms.domain.entity.Area;
 import com.ruoyi.wms.domain.entity.Warehouse;
 import com.ruoyi.wms.domain.vo.WarehouseVo;
 import com.ruoyi.wms.mapper.AreaMapper;
 import com.ruoyi.wms.mapper.WarehouseMapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin-wms/src/main/resources/application-dev.yml
similarity index 100%
rename from ruoyi-admin/src/main/resources/application-dev.yml
rename to ruoyi-admin-wms/src/main/resources/application-dev.yml
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin-wms/src/main/resources/application-prod.yml
similarity index 100%
rename from ruoyi-admin/src/main/resources/application-prod.yml
rename to ruoyi-admin-wms/src/main/resources/application-prod.yml
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin-wms/src/main/resources/application.yml
similarity index 100%
rename from ruoyi-admin/src/main/resources/application.yml
rename to ruoyi-admin-wms/src/main/resources/application.yml
diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin-wms/src/main/resources/banner.txt
similarity index 100%
rename from ruoyi-admin/src/main/resources/banner.txt
rename to ruoyi-admin-wms/src/main/resources/banner.txt
diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/ruoyi-admin-wms/src/main/resources/i18n/messages.properties
similarity index 100%
rename from ruoyi-admin/src/main/resources/i18n/messages.properties
rename to ruoyi-admin-wms/src/main/resources/i18n/messages.properties
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin-wms/src/main/resources/i18n/messages_en_US.properties
similarity index 100%
rename from ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
rename to ruoyi-admin-wms/src/main/resources/i18n/messages_en_US.properties
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin-wms/src/main/resources/i18n/messages_zh_CN.properties
similarity index 100%
rename from ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
rename to ruoyi-admin-wms/src/main/resources/i18n/messages_zh_CN.properties
diff --git a/ruoyi-admin/src/main/resources/ip2region.xdb b/ruoyi-admin-wms/src/main/resources/ip2region.xdb
similarity index 100%
rename from ruoyi-admin/src/main/resources/ip2region.xdb
rename to ruoyi-admin-wms/src/main/resources/ip2region.xdb
diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/ruoyi-admin-wms/src/main/resources/logback-plus.xml
similarity index 100%
rename from ruoyi-admin/src/main/resources/logback-plus.xml
rename to ruoyi-admin-wms/src/main/resources/logback-plus.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/AreaMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/AreaMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/AreaMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/AreaMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/InventoryDetailMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/InventoryDetailMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/InventoryDetailMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/InventoryDetailMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/InventoryHistoryMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/InventoryHistoryMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/InventoryHistoryMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/InventoryHistoryMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/InventoryMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/InventoryMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/InventoryMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/InventoryMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ItemCategoryMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/ItemCategoryMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ItemCategoryMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/ItemCategoryMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ItemMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/ItemMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ItemMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/ItemMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ItemSkuMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/ItemSkuMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ItemSkuMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/ItemSkuMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/MerchantMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/MerchantMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/MerchantMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/MerchantMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ReceiptOrderDetailMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/ReceiptOrderDetailMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ReceiptOrderDetailMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/ReceiptOrderDetailMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ReceiptOrderMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/ReceiptOrderMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/ReceiptOrderMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/ReceiptOrderMapper.xml
diff --git a/ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/WarehouseMapper.xml b/ruoyi-admin-wms/src/main/resources/mapper.wms/WarehouseMapper.xml
similarity index 100%
rename from ruoyi-modules/ruoyi-wms-service/src/main/resources/mapper/wms/WarehouseMapper.xml
rename to ruoyi-admin-wms/src/main/resources/mapper.wms/WarehouseMapper.xml
diff --git a/ruoyi-admin/src/main/resources/spy.properties b/ruoyi-admin-wms/src/main/resources/spy.properties
similarity index 100%
rename from ruoyi-admin/src/main/resources/spy.properties
rename to ruoyi-admin-wms/src/main/resources/spy.properties
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java b/ruoyi-admin-wms/src/test/java/com/ruoyi/test/AssertUnitTest.java
similarity index 100%
rename from ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java
rename to ruoyi-admin-wms/src/test/java/com/ruoyi/test/AssertUnitTest.java
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java b/ruoyi-admin-wms/src/test/java/com/ruoyi/test/DemoUnitTest.java
similarity index 100%
rename from ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java
rename to ruoyi-admin-wms/src/test/java/com/ruoyi/test/DemoUnitTest.java
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java b/ruoyi-admin-wms/src/test/java/com/ruoyi/test/ParamUnitTest.java
similarity index 100%
rename from ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java
rename to ruoyi-admin-wms/src/test/java/com/ruoyi/test/ParamUnitTest.java
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/PasswordTest.java b/ruoyi-admin-wms/src/test/java/com/ruoyi/test/PasswordTest.java
similarity index 100%
rename from ruoyi-admin/src/test/java/com/ruoyi/test/PasswordTest.java
rename to ruoyi-admin-wms/src/test/java/com/ruoyi/test/PasswordTest.java
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java b/ruoyi-admin-wms/src/test/java/com/ruoyi/test/TagUnitTest.java
similarity index 100%
rename from ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java
rename to ruoyi-admin-wms/src/test/java/com/ruoyi/test/TagUnitTest.java
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index ed63ba9..11597f9 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -13,7 +13,6 @@
         <module>ruoyi-demo</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-system</module>
-        <module>ruoyi-wms-service</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>
diff --git a/ruoyi-modules/ruoyi-wms-service/pom.xml b/ruoyi-modules/ruoyi-wms-service/pom.xml
deleted file mode 100644
index d64b0c1..0000000
--- a/ruoyi-modules/ruoyi-wms-service/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-modules</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <description>
-        wms系统模块
-    </description>
-
-    <artifactId>ruoyi-wms-service</artifactId>
-
-    <dependencies>
-
-        <!-- 通用工具-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
-        </dependency>
-
-        <!-- 通用工具-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-system</artifactId>
-        </dependency>
-
-        <!-- excel -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-excel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-log</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-translation</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-redis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-mybatis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-idempotent</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-doc</artifactId>
-        </dependency>
-
-    </dependencies>
-</project>