diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/DictConstantPool.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
index a3cb0ca..9529ca4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
@@ -1,4 +1,4 @@
-package org.nl.common.domain.constant;
+package org.nl.common.domain.constantt;
 
 /**
  * s
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/RsaProperties.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/RsaProperties.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/config/RsaProperties.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/RsaProperties.java
index 399a47a..e20b8e4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/RsaProperties.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/RsaProperties.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.config;
+package org.nl.common.domain.constant;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
index 13e77e0..43e7996 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache;
 import lombok.Data;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.config.MapOf;
+import org.nl.common.utils.MapOf;
 import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
 
 import java.lang.reflect.Type;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
index b6a492f..ce0b4bf 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
@@ -4,7 +4,7 @@ import lombok.SneakyThrows;
 import org.nl.common.exception.BadRequestException;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.coderule.ISysCodeRuleService;
+import org.nl.wms.system_manage.service.coderule.ISysCodeRuleService;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java
deleted file mode 100644
index 21796f2..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java
+++ /dev/null
@@ -1,433 +0,0 @@
-package org.nl.common.utils;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.template.*;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.system.service.generator.dao.CodeColumnConfig;
-import org.nl.system.service.generator.dao.CodeGenConfig;
-import org.springframework.util.ObjectUtils;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.nl.common.utils.FileUtil.SYS_TEM_DIR;
-
-/**
- * @author: lyd
- * @description: 代码生成
- * @Date: 2022/12/2
- */
-@Slf4j
-@SuppressWarnings({"unchecked", "all"})
-public class GenUtil {
-    private static final String TIMESTAMP = "Timestamp";
-
-    private static final String Date = "Date";
-
-    private static final String BIGDECIMAL = "BigDecimal";
-
-    public static final String PK = "PRI";
-
-    public static final String EXTRA = "auto_increment";
-
-    /**
-     * 获取后端代码模板名称
-     *
-     * @return List
-     */
-    private static List<String> getAdminTemplateNames() {
-        List<String> templateNames = new ArrayList<>();
-        templateNames.add("Entity");
-        templateNames.add("MySQLMapper");
-        templateNames.add("Dto");
-        templateNames.add("Mapper");
-        templateNames.add("Controller");
-        templateNames.add("QueryCriteria");
-        templateNames.add("Service");
-        templateNames.add("ServiceImpl");
-        // templateNames.add("Repository");
-        return templateNames;
-    }
-
-    /**
-     * 获取前端代码模板名称
-     *
-     * @return List
-     */
-    private static List<String> getFrontTemplateNames() {
-        List<String> templateNames = new ArrayList<>();
-        templateNames.add("index");
-        templateNames.add("api");
-        return templateNames;
-    }
-
-    public static List<Map<String, Object>> preview(List<CodeColumnConfig> columns, CodeGenConfig genConfig) {
-        Map<String, Object> genMap = getGenMap(columns, genConfig); // 获取参数
-        List<Map<String, Object>> genList = new ArrayList<>();
-        // 获取后端模版
-        List<String> templates = getAdminTemplateNames();
-        TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
-        for (String templateName : templates) { // 创建模板
-            Map<String, Object> map = new HashMap<>(1);
-            Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl");
-            map.put("content", template.render(genMap));
-            map.put("name", templateName);
-            genList.add(map);
-        }
-        // 获取前端模版
-        templates = getFrontTemplateNames();
-        for (String templateName : templates) {
-            Map<String, Object> map = new HashMap<>(1);
-            Template template = engine.getTemplate("generator/front/" + templateName + ".ftl");
-            map.put(templateName, template.render(genMap));
-            map.put("content", template.render(genMap));
-            map.put("name", templateName);
-            genList.add(map);
-        }
-        return genList;
-    }
-
-    /**
-     * 定义后端文件路径以及名称
-     */
-    private static String getAdminFilePath(String templateName, CodeGenConfig genConfig, String className, String rootPath) {
-        String projectPath = rootPath + File.separator + genConfig.getModule_name() + File.separator;
-        String packagePath = projectPath + "src" + File.separator + "main" + File.separator + "java" + File.separator;
-        if (!ObjectUtils.isEmpty(genConfig.getPack())) {
-            packagePath += genConfig.getPack().replace(".", File.separator) + File.separator;
-        }
-
-        if ("Entity".equals(templateName)) {
-            return packagePath + "service" + File.separator + "dao" + File.separator + className + ".java";
-        }
-
-        if ("Controller".equals(templateName)) {
-            return packagePath + "controller" + File.separator + className + "Controller.java";
-        }
-
-        if ("Service".equals(templateName)) {
-            return packagePath + "service" + File.separator + "I" + className + "Service.java";
-        }
-
-        if ("ServiceImpl".equals(templateName)) {
-            return packagePath + "service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java";
-        }
-
-        if ("Dto".equals(templateName)) {
-            return packagePath + "service" + File.separator + "dto" + File.separator + className + "Dto.java";
-        }
-
-        if ("QueryCriteria".equals(templateName)) {
-            return packagePath + "service" + File.separator + "dto" + File.separator + className + "Query.java";
-        }
-
-        if ("Mapper".equals(templateName)) {
-            return packagePath + "service" + File.separator + "dao" + File.separator + "mapper" + File.separator + className + "Mapper.java";
-        }
-
-        if ("MySQLMapper".equals(templateName)) {
-            return packagePath + "service" + File.separator + "dao" + File.separator + "mapper" + File.separator + className + "Mapper.xml";
-        }
-
-        return null;
-    }
-
-    /**
-     * 定义前端文件路径以及名称
-     */
-    private static String getFrontFilePath(String templateName, String apiPath, String path, String apiName) {
-
-        if ("api".equals(templateName)) {
-            return path + File.separator + apiName + ".js";
-        }
-
-        if ("index".equals(templateName)) {
-            return path + File.separator + "index.vue";
-        }
-
-        return null;
-    }
-
-    // 获取模版数据
-    private static Map<String, Object> getGenMap(List<CodeColumnConfig> columnInfos, CodeGenConfig genConfig) {
-        // 存储模版字段数据
-        Map<String, Object> genMap = new HashMap<>(16);
-        // 接口别名
-        genMap.put("apiAlias", genConfig.getApi_alias());
-        // 包名称
-        genMap.put("package", genConfig.getPack());
-        // 模块名称
-        genMap.put("moduleName", genConfig.getModule_name());
-        // 作者
-        genMap.put("author", genConfig.getAuthor());
-        // 创建日期
-        genMap.put("date", LocalDate.now().toString());
-        // 表名
-        genMap.put("tableName", genConfig.getTable_name());
-        // 大写开头的类名
-        String className = StringUtils.toCapitalizeCamelCase(genConfig.getTable_name());
-        // 小写开头的类名
-        String changeClassName = StringUtils.toCamelCase(genConfig.getTable_name());
-        // 判断是否去除表前缀
-        if (StrUtil.isNotEmpty(genConfig.getPrefix())) {
-            className = StringUtils.toCapitalizeCamelCase(StrUtil.removePrefix(genConfig.getTable_name(), genConfig.getPrefix()));
-            changeClassName = StringUtils.toCamelCase(StrUtil.removePrefix(genConfig.getTable_name(), genConfig.getPrefix()));
-        }
-        // 保存类名
-        genMap.put("className", className); // 驼峰命名
-        // 保存小写开头的类名
-        genMap.put("changeClassName", changeClassName);
-        // 存在 Timestamp 字段
-        genMap.put("hasTimestamp", false);
-        // 查询类中存在 Timestamp 字段
-        genMap.put("queryHasTimestamp", false);
-        // 存在 BigDecimal 字段
-        genMap.put("hasBigDecimal", false);
-        // 查询类中存在 BigDecimal 字段
-        genMap.put("queryHasBigDecimal", false);
-        // 是否需要创建查询
-        genMap.put("hasQuery", false);
-        // 是否有主键
-        genMap.put("hasPk", false);
-        // 自增主键
-        genMap.put("auto", false);
-        genMap.put("hasDate", false);
-        // 存在字典
-        genMap.put("hasDict", false);
-        // 存在日期注解
-        genMap.put("hasDateAnnotation", false);
-        // 保存字段信息
-        List<Map<String, Object>> columns = new ArrayList<>();
-        // 保存查询字段的信息
-        List<Map<String, Object>> queryColumns = new ArrayList<>();
-        // 存储字典信息
-        List<String> dicts = new ArrayList<>();
-        // 存储 between 信息
-        List<Map<String, Object>> betweens = new ArrayList<>();
-        // 存储不为空的字段信息
-        List<Map<String, Object>> isNotNullColumns = new ArrayList<>();
-
-        for (CodeColumnConfig column : columnInfos) { // 遍历所有字段
-            Map<String, Object> listMap = new HashMap<>(16);
-            // 字段描述
-            listMap.put("remark", column.getRemark());
-            // 字段类型
-            listMap.put("columnKey", column.getKey_type());
-            // 主键类型
-            String colType = ColUtil.cloToJava(column.getColumn_type());
-            // 小写开头的字段名 - 转驼峰
-//            String changeColumnName = StringUtils.toCamelCase(column.getColumnName());
-            String changeColumnName = column.getColumn_name();
-            // 大写开头的字段名
-            String capitalColumnName = StringUtils.toCapitalizeCamelCase(column.getColumn_name());
-            if (PK.equals(column.getKey_type())) { // 如果是主键
-                genMap.put("hasPk", true);
-                // 存储主键类型
-                genMap.put("pkColumnType", colType);
-                // 存储小写开头的字段名
-                genMap.put("pkChangeColName", changeColumnName);
-                // 存储大写开头的字段名
-                genMap.put("pkCapitalColName", capitalColumnName);
-            }
-            // 是否存在 Timestamp 类型的字段
-            if (TIMESTAMP.equals(colType)) {
-                genMap.put("hasTimestamp", true);
-            }
-            // 是否存在 BigDecimal 类型的字段
-            if (BIGDECIMAL.equals(colType)) {
-                genMap.put("hasBigDecimal", true);
-            }
-            // 主键是否自增
-            if (EXTRA.equals(column.getExtra())) {
-                genMap.put("auto", true);
-            }
-            // 主键存在字典
-            if (StrUtil.isNotEmpty(column.getDict_name())) {
-                genMap.put("hasDict", true);
-                dicts.add(column.getDict_name());
-            }
-
-            // 存储字段类型
-            listMap.put("columnType", colType);
-            // 存储字原始段名称
-            listMap.put("columnName", column.getColumn_name());
-            // 不为空
-            listMap.put("istNotNull", column.getNot_null());
-            // 字段列表显示
-            listMap.put("columnShow", column.getList_show());
-            // 表单显示
-            listMap.put("formShow", column.getForm_show());
-            // 表单组件类型
-            listMap.put("formType", StrUtil.isNotEmpty(column.getForm_type()) ? column.getForm_type() : "Input");
-            // 小写开头的字段名称
-            listMap.put("changeColumnName", changeColumnName);
-            //大写开头的字段名称
-            listMap.put("capitalColumnName", capitalColumnName);
-            // 字典名称
-            listMap.put("dictName", column.getDict_name());
-            // 日期注解
-            listMap.put("dateAnnotation", column.getDate_annotation());
-            if (StrUtil.isNotEmpty(column.getDate_annotation())) {
-                genMap.put("hasDateAnnotation", true);
-            }
-            // 添加非空字段信息
-            if (column.getNot_null()) {
-                isNotNullColumns.add(listMap);
-            }
-            // 判断是否有查询，如有则把查询的字段set进columnQuery
-            if (!StrUtil.isEmpty(column.getQuery_type())) {
-                // 查询类型
-                listMap.put("queryType", column.getQuery_type());
-                // 是否存在查询
-                genMap.put("hasQuery", true);
-                if (TIMESTAMP.equals(colType)) {
-                    // 查询中存储 Timestamp 类型
-                    genMap.put("queryHasTimestamp", true);
-                }
-                if (BIGDECIMAL.equals(colType)) {
-                    // 查询中存储 BigDecimal 类型
-                    genMap.put("queryHasBigDecimal", true);
-                }
-                if ("between".equalsIgnoreCase(column.getQuery_type())) {
-                    betweens.add(listMap);
-                } else {
-                    // 添加到查询列表中
-                    queryColumns.add(listMap);
-                }
-            }
-            // 添加到字段列表中
-            columns.add(listMap);
-        }
-        // 保存字段列表
-        genMap.put("columns", columns);
-        // 保存查询列表
-        genMap.put("queryColumns", queryColumns);
-        // 保存字段列表
-        genMap.put("dicts", dicts);
-        // 保存查询列表
-        genMap.put("betweens", betweens);
-        // 保存非空字段信息
-        genMap.put("isNotNullColumns", isNotNullColumns);
-        return genMap;
-    }
-
-    /**
-     * 打包下载
-     * @param columns
-     * @param genConfig
-     * @return
-     * @throws IOException
-     */
-    public static String download(List<CodeColumnConfig> columns, CodeGenConfig genConfig) throws IOException {
-        // 拼接的路径：/tmpnladmin-gen-temp/，这个路径在Linux下需要root用户才有权限创建,非root用户会权限错误而失败，更改为： /tmp/nladmin-gen-temp/
-        // String tempPath =SYS_TEM_DIR + "nladmin-gen-temp" + File.separator + genConfig.getTableName() + File.separator;
-        String tempPath = SYS_TEM_DIR + "nladmin-gen-temp" + File.separator + genConfig.getTable_name() + File.separator;
-        Map<String, Object> genMap = getGenMap(columns, genConfig);
-        TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
-        // 生成后端代码
-        List<String> templates = getAdminTemplateNames();
-        for (String templateName : templates) {
-            Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl");
-            String filePath = getAdminFilePath(templateName, genConfig, genMap.get("className").toString(), tempPath + "eladmin" + File.separator);
-            assert filePath != null;
-            File file = new File(filePath);
-            // 如果非覆盖生成
-            if (!genConfig.getCover() && FileUtil.exist(file)) {
-                continue;
-            }
-            // 生成代码
-            genFile(file, template, genMap);
-        }
-        // 生成前端代码
-        templates = getFrontTemplateNames();
-        for (String templateName : templates) {
-            Template template = engine.getTemplate("generator/front/" + templateName + ".ftl");
-            String path = tempPath + "nladmin-web" + File.separator;
-            String apiPath = path + "src" + File.separator + "api" + File.separator;
-            String srcPath = path + "src" + File.separator + "views" + File.separator + genMap.get("changeClassName").toString() + File.separator;
-            String filePath = getFrontFilePath(templateName, apiPath, srcPath, genMap.get("changeClassName").toString());
-            assert filePath != null;
-            File file = new File(filePath);
-            // 如果非覆盖生成
-            if (!genConfig.getCover() && FileUtil.exist(file)) {
-                continue;
-            }
-            // 生成代码
-            genFile(file, template, genMap);
-        }
-        return tempPath;
-    }
-
-    /**
-     * 生成文件
-     * @param file
-     * @param template
-     * @param map
-     * @throws IOException
-     */
-    private static void genFile(File file, Template template, Map<String, Object> map) throws IOException {
-        // 生成目标文件
-        Writer writer = null;
-        try {
-            FileUtil.touch(file);
-            writer = new FileWriter(file);
-            template.render(map, writer);
-        } catch (TemplateException | IOException e) {
-            throw new RuntimeException(e);
-        } finally {
-            assert writer != null;
-            writer.close();
-        }
-    }
-
-    /**
-     * 生成代码
-     * @param columnInfos
-     * @param genConfig
-     * @throws IOException
-     */
-    public static void generatorCode(List<CodeColumnConfig> columnInfos, CodeGenConfig genConfig) throws IOException {
-        Map<String, Object> genMap = getGenMap(columnInfos, genConfig);
-        TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
-        // 生成后端代码
-        List<String> templates = getAdminTemplateNames();
-        for (String templateName : templates) {
-            Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl");
-            String filePath = getAdminFilePath(templateName, genConfig, genMap.get("className").toString(), System.getProperty("user.dir"));
-
-            assert filePath != null;
-            File file = new File(filePath);
-
-            // 如果非覆盖生成
-            if (!genConfig.getCover() && FileUtil.exist(file)) {
-                continue;
-            }
-            // 生成代码
-            genFile(file, template, genMap);
-        }
-
-        // 生成前端代码
-        templates = getFrontTemplateNames();
-        for (String templateName : templates) {
-            Template template = engine.getTemplate("generator/front/" + templateName + ".ftl");
-            String filePath = getFrontFilePath(templateName, genConfig.getApi_path(), genConfig.getPath(), genMap.get("changeClassName").toString());
-
-            assert filePath != null;
-            File file = new File(filePath);
-
-            // 如果非覆盖生成
-            if (!genConfig.getCover() && FileUtil.exist(file)) {
-                continue;
-            }
-            // 生成代码
-            genFile(file, template, genMap);
-        }
-    }
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java
index ad9827e..e089a23 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java
@@ -3,7 +3,7 @@ package org.nl.common.utils.dto;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import org.nl.system.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/IdUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/IdUtil.java
deleted file mode 100644
index fcd489e..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/IdUtil.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.nl.config;
-
-/**
- * <p>
- * ID生成工具类
- * </p>
- *
- * @author generator
- * @since 2023-11-16
- */
-public class IdUtil {
-    public static Long getLongId() {
-        return cn.hutool.core.util.IdUtil.getSnowflake(1, 1).nextId();
-    }
-
-    public static String getStringId() {
-        return String.valueOf(IdUtil.getLongId());
-    }
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java
deleted file mode 100644
index 2b5d8e2..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.nl.config;
-
-
-import org.checkerframework.checker.units.qual.K;
-import org.springframework.util.CollectionUtils;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Iterator;
-
-/**
- * s
- * @author ZZQ
- * @Date 2022/11/29 2:55 下午
- */
-public class MapOf implements Serializable {
-
-    public static <K> HashMap of(K... key){
-        HashMap map = new HashMap<>();
-        for (int i = 0; i < (key.length & ~1); i=i+2) {
-            map.put(key[i],key[i+1]);
-        }
-        return map;
-    }
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java
index d06a4a1..62dc3b4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java
@@ -1,7 +1,7 @@
 package org.nl.config.language;
 
 import org.apache.commons.lang3.StringUtils;
-import org.nl.config.MapOf;
+import org.nl.common.utils.MapOf;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.LocaleResolver;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/controller/GateWayController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/controller/GateWayController.java
similarity index 88%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/controller/GateWayController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/gateway/controller/GateWayController.java
index faacabc..5b99619 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/controller/GateWayController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/controller/GateWayController.java
@@ -1,9 +1,9 @@
-package org.nl.wms.gateway.controller;
+package org.nl.gateway.controller;
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.gateway.service.GateWayService;
-import org.nl.wms.gateway.dto.InteracteDto;
+import org.nl.gateway.service.GateWayService;
+import org.nl.gateway.dto.InteracteDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/dto/InteracteDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/dto/InteracteDto.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/dto/InteracteDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/gateway/dto/InteracteDto.java
index 94f6e3e..32faf4e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/dto/InteracteDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/dto/InteracteDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.gateway.dto;
+package org.nl.gateway.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/service/GateWayService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/GateWayService.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/service/GateWayService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/GateWayService.java
index be39afb..8b4fcc8 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/service/GateWayService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/GateWayService.java
@@ -1,13 +1,12 @@
-package org.nl.wms.gateway.service;
+package org.nl.gateway.service;
 
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.RedissonUtils;
-import org.nl.wms.ext.service.AcsToWmsService;
-import org.nl.wms.gateway.dto.InteracteDto;
-import org.nl.wms.gateway.service.impl.GateWayServiceImpl;
+import org.nl.gateway.dto.InteracteDto;
+import org.nl.gateway.service.impl.GateWayServiceImpl;
 import org.nl.wms.sch_manage.service.ISchBasePointService;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
 import org.nl.wms.sch_manage.service.dao.SchBasePoint;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/service/impl/GateWayServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/impl/GateWayServiceImpl.java
similarity index 86%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/service/impl/GateWayServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/impl/GateWayServiceImpl.java
index 10f49c5..6e0e263 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/gateway/service/impl/GateWayServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/gateway/service/impl/GateWayServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.gateway.service.impl;
+package org.nl.gateway.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
@@ -6,11 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.exception.BadRequestException;
-import org.nl.wms.gateway.dto.InteracteDto;
-import org.nl.wms.sch_manage.service.ISchBasePointService;
-import org.nl.wms.sch_manage.service.ISchBaseTaskService;
+import org.nl.gateway.dto.InteracteDto;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java
deleted file mode 100644
index d5c51ec..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.nl.system.controller.generator;
-
-
-import cn.dev33.satoken.annotation.SaIgnore;
-
-
-import lombok.RequiredArgsConstructor;
-import org.nl.system.service.generator.ICodeGenConfigService;
-import org.nl.system.service.generator.dao.CodeGenConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * <p>
- * 代码生成配置表 前端控制器
- * </p>
- *
- * @author lyd
- * @since 2023-05-03
- */
-@SaIgnore
-@RestController
-@RequestMapping("api/genConfig")
-public class CodeGenConfigController {
-
-    @Autowired
-    private ICodeGenConfigService genConfigService;
-
-
-    @GetMapping(value = "/{tableName}")
-    public ResponseEntity<Object> query(@PathVariable String tableName){
-        return new ResponseEntity<>(genConfigService.findByTableName(tableName), HttpStatus.OK);
-    }
-
-
-    @PutMapping
-    public ResponseEntity<Object> update(@Validated @RequestBody CodeGenConfig genConfig){
-        return new ResponseEntity<>(genConfigService.update(genConfig.getTable_name(), genConfig),HttpStatus.OK);
-    }
-}
-
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java
deleted file mode 100644
index 7c6f838..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.nl.system.controller.generator;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-
-
-import org.nl.common.base.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.generator.ICodeGenConfigService;
-import org.nl.system.service.generator.ICodeGeneratorService;
-import org.nl.system.service.generator.dao.CodeColumnConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * <p>
- * 列的数据信息表 前端控制器
- * </p>
- *
- * @author lyd
- * @since 2023-05-03
- */
-@SaIgnore
-@RestController
-@RequestMapping("/api/generator")
-public class CodeGeneratorController {
-    @Autowired
-    private ICodeGeneratorService generatorService;
-    @Autowired
-    private ICodeGenConfigService genConfigService;
-
-    @Value("${generator.enabled}")
-    private Boolean generatorEnabled;
-
-
-    @GetMapping(value = "/tables")
-    public ResponseEntity<Object> queryTables(@RequestParam(defaultValue = "") String name, PageQuery pageable){
-        return new ResponseEntity<>(TableDataInfo.build(generatorService.getTables(name, pageable)), HttpStatus.OK);
-    }
-
-
-    @GetMapping(value = "/columns")
-    public ResponseEntity<Object> queryColumns(@RequestParam String tableName){
-        return new ResponseEntity<>(TableDataInfo.build(generatorService.getColumns(tableName)), HttpStatus.OK);
-    }
-
-
-    @PutMapping
-    public ResponseEntity<HttpStatus> save(@RequestBody List<CodeColumnConfig> columnInfos){
-        generatorService.updateBatchById(columnInfos);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-
-    @PostMapping(value = "sync")
-    public ResponseEntity<HttpStatus> sync(@RequestBody List<String> tables){
-        for (String table : tables) {
-            generatorService.sync(generatorService.getColumns(table), generatorService.query(table));
-        }
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-
-    @PostMapping(value = "/{tableName}/{type}")
-    public ResponseEntity<Object> generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){
-        if(!generatorEnabled && type == 0){
-            throw new BadRequestException(LangProcess.msg("error_CodeGenerator"));
-        }
-        switch (type){
-            // 生成代码
-            case 0: generatorService.generator(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName));
-                break;
-            // 预览
-            case 1: return generatorService.preview(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName));
-            // 打包
-            case 2: generatorService.download(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName), request, response);
-                break;
-            default: throw new BadRequestException(LangProcess.msg("error_NullPoint"));
-        }
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}
-
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java
deleted file mode 100644
index 1ae10b9..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.nl.system.service.generator;
-
-import org.nl.system.service.generator.dao.CodeGenConfig;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 代码生成配置表 服务类
- * </p>
- *
- * @author lyd
- * @since 2023-05-03
- */
-public interface ICodeGenConfigService extends IService<CodeGenConfig> {
-
-    /**
-     * 根据表名查找
-     * @param tableName
-     * @return
-     */
-    CodeGenConfig findByTableName(String tableName);
-
-    /**
-     * 根据表名更新
-     * @param tableName
-     * @param genConfig
-     * @return
-     */
-    CodeGenConfig update(String tableName, CodeGenConfig genConfig);
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java
deleted file mode 100644
index 2b10b25..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.nl.system.service.generator;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.generator.dao.CodeColumnConfig;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.system.service.generator.dao.CodeGenConfig;
-import org.nl.system.service.generator.dto.TablesInfo;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Async;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * <p>
- * 列的数据信息表 服务类
- * </p>
- *
- * @author lyd
- * @since 2023-05-03
- */
-public interface ICodeGeneratorService extends IService<CodeColumnConfig> {
-
-    /**
-     * 获得所有的表格信息
-     * @param name
-     * @param pageQuery
-     * @return IPage<TablesInfo>
-     */
-    IPage<TablesInfo> getTables(String name, PageQuery pageQuery);
-
-    /**
-     * 得到数据表的元数据
-     * @param tableName 表名
-     * @return /
-     */
-    IPage<CodeColumnConfig> getColumns(String tableName);
-
-    /**
-     * 根据表名查询表字段
-     * @param tableName
-     * @return
-     */
-    List<CodeColumnConfig> query(String tableName);
-
-    /**
-     * 同步表数据
-     * @param columnInfos /
-     * @param columnInfoList /
-     */
-    @Async
-    void sync(IPage<CodeColumnConfig> columnInfos, List<CodeColumnConfig> columnInfoList);
-
-    /**
-     * 视图
-     * @param byTableName
-     * @param columns
-     * @return ResponseEntity<Object>
-     */
-    ResponseEntity<Object> preview(CodeGenConfig byTableName, IPage<CodeColumnConfig> columns);
-
-    /**
-     * 打包下载
-     * @param genConfig 配置信息
-     * @param columnsPage 字段信息分页数据
-     * @param request /
-     * @param response /
-     */
-    void download(CodeGenConfig genConfig, IPage<CodeColumnConfig> columnsPage, HttpServletRequest request, HttpServletResponse response);
-
-    /**
-     * 代码生成
-     * @param genConfig 配置信息
-     * @param columnsPage 字段信息分页数据
-     */
-    void generator(CodeGenConfig genConfig, IPage<CodeColumnConfig> columnsPage);
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java
deleted file mode 100644
index 908c312..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.nl.system.service.generator.dao;
-
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.nl.common.utils.GenUtil;
-import org.nl.system.service.generator.dto.ColumnInfo;
-
-/**
- * <p>
- * 列的数据信息表
- * </p>
- *
- * @author generator
- * @since 2023-05-03
- */
-@Data
-@TableName("code_column_config")
-public class CodeColumnConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 标识
-     */
-    @TableId(value = "column_id", type = IdType.ASSIGN_ID)
-    private String column_id;
-
-    
-    private String table_name;
-
-    
-    private String column_name;
-
-    
-    private String column_type;
-
-    
-    private String key_type;
-
-    
-    private String extra;
-
-    
-    private String remark;
-
-    
-    private Boolean not_null;
-
-    
-    private Boolean list_show;
-
-    
-    private Boolean form_show;
-
-    
-    private String form_type;
-
-    
-    private String query_type;
-
-    
-    private String dict_name;
-
-    
-    private String date_annotation;
-
-    /**
-     * 创建默认的实体
-     * @param tableName /
-     * @param config /
-     * @return CodeColumnConfig
-     */
-    public static CodeColumnConfig createDefault(String tableName, ColumnInfo config) {
-        CodeColumnConfig columnConfig = new CodeColumnConfig();
-        columnConfig.setColumn_id(IdUtil.getSnowflake(1,1).nextIdStr());
-        columnConfig.setTable_name(tableName);
-        columnConfig.setColumn_name(config.getColumn_name());
-        columnConfig.setColumn_type(config.getColumn_type());
-        columnConfig.setKey_type(config.getKey_type());
-        columnConfig.setExtra(config.getExtra());
-        columnConfig.setNot_null((ObjectUtil.isNotEmpty(config.getKey_type())
-                &&ObjectUtil.isNotEmpty(config.getExtra())
-                && GenUtil.PK.equalsIgnoreCase(config.getKey_type())
-                &&GenUtil.EXTRA.equalsIgnoreCase(config.getExtra()))
-                ?false:ObjectUtil.isNotEmpty(config.getNot_null())?config.getNot_null():false);
-        columnConfig.setRemark(ObjectUtil.isNotEmpty(config.getRemark())?config.getRemark():null);
-        columnConfig.setList_show(true);
-        columnConfig.setForm_show(true);
-        return columnConfig;
-    }
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java
deleted file mode 100644
index 3d438c1..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.nl.system.service.generator.dao;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * <p>
- * 代码生成配置表
- * </p>
- *
- * @author lyd
- * @since 2023-05-03
- */
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@TableName("code_gen_config")
-public class CodeGenConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    public CodeGenConfig(String table_name) {
-        this.table_name = table_name;
-    }
-
-    /**
-     * ID
-     */
-    @TableId(value = "config_id")
-    private String config_id;
-
-    /**
-     * 表名
-     */
-    private String table_name;
-
-    /**
-     * 作者
-     */
-    private String author;
-
-    /**
-     * 是否覆盖
-     */
-    private Boolean cover;
-
-    /**
-     * 模块名称
-     */
-    private String module_name;
-
-    /**
-     * 包名
-     */
-    private String pack;
-
-    /**
-     * 路径
-     */
-    private String path;
-
-    /**
-     * api路径
-     */
-    private String api_path;
-
-    /**
-     * 表前缀
-     */
-    private String prefix;
-
-    /**
-     * 接口名称
-     */
-    private String api_alias;
-
-
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java
deleted file mode 100644
index ace02fd..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.nl.system.service.generator.dao.mapper;
-
-import org.nl.system.service.generator.dao.CodeColumnConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.system.service.generator.dto.ColumnInfo;
-import org.nl.system.service.generator.dto.TablesInfo;
-
-import java.util.List;
-
-/**
- * <p>
- * 列的数据信息表 Mapper 接口
- * </p>
- *
- * @author lyd
- * @since 2023-05-03
- */
-public interface CodeColumnConfigMapper extends BaseMapper<CodeColumnConfig> {
-
-    /**
-     * 分页查找
-     * @param name /
-     * @param pageSize /
-     * @param offset /
-     * @return List<TablesInfo>
-     */
-    List<TablesInfo> getTables(String name, int pageSize, int offset);
-
-    /**
-     * 分页查询的总数
-     * @param name
-     * @return long
-     */
-    long getTablesTotal(String name);
-
-    /**
-     * 获取字段名称
-     * @param tableName
-     * @return List<ColumnInfo>
-     */
-    List<ColumnInfo> getTablesByTableName(String tableName);
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml
deleted file mode 100644
index e35f1b8..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.generator.dao.mapper.CodeColumnConfigMapper">
-
-    <select id="getTables" resultType="org.nl.system.service.generator.dto.TablesInfo">
-        SELECT
-            table_name,
-            create_time,
-            engine,
-            table_collation AS coding,
-            table_comment AS remark
-        FROM
-            information_schema.tables
-        WHERE
-            table_schema = (SELECT database())
-            <if test="name != null and name != ''">
-                AND table_name LIKE #{name}
-            </if>
-        ORDER BY create_time DESC
-        LIMIT #{pageSize} OFFSET #{offset}
-    </select>
-    <select id="getTablesTotal" resultType="java.lang.Long">
-        SELECT count(*)
-        FROM information_schema.tables
-        WHERE table_schema = (select database())
-        <if test="name != null and name != ''">
-            AND table_name LIKE #{name}
-        </if>
-    </select>
-    <select id="getTablesByTableName" resultType="org.nl.system.service.generator.dto.ColumnInfo">
-        SELECT
-            column_name,
-            is_nullable as is_null,
-            data_type as column_type,
-            column_comment as remark,
-            column_key as key_type,
-            extra
-        FROM information_schema.columns
-        WHERE
-            table_schema = (SELECT database())
-            <if test="tableName != null and tableName != ''">
-                AND table_name = #{tableName}
-            </if>
-        ORDER BY ordinal_position
-    </select>
-</mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.java
deleted file mode 100644
index 1fb385f..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.system.service.generator.dao.mapper;
-
-import org.nl.system.service.generator.dao.CodeGenConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 代码生成配置表 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2023-05-03
- */
-public interface CodeGenConfigMapper extends BaseMapper<CodeGenConfig> {
-
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java
deleted file mode 100644
index 9ed98b3..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.nl.system.service.generator.dto;
-
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 字段信息
- * @Date: 2023/5/3
- */
-@Data
-public class ColumnInfo {
-    
-    private String column_name;
-
-    
-    private String column_type;
-
-    
-    private String key_type;
-
-    
-    private String extra;
-
-    
-    private String remark;
-
-    
-    private Boolean not_null;
-
-    
-    private Boolean list_show;
-
-    
-    private Boolean form_show;
-
-    
-    private String form_type;
-
-    
-    private String query_type;
-
-    
-    private String dict_name;
-
-    
-    private String date_annotation;
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/TablesInfo.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/TablesInfo.java
deleted file mode 100644
index 9dce5d9..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/TablesInfo.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.nl.system.service.generator.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @Author: lyd
- * @Description: 表的数据信息
- * @Date: 2023/5/3
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TablesInfo {
-    /**
-     * 表名
-     */
-    private String table_name;
-
-    /**
-     * 创建时间
-     */
-    private String create_time;
-
-    /**
-     * 引擎
-     */
-    private String ENGINE;
-
-    /**
-     * 字符序
-     */
-    private String coding;
-
-    /**
-     * 注释
-     */
-    private String remark;
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java
deleted file mode 100644
index 7d0f5af..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.nl.system.service.generator.impl;
-
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.system.service.generator.ICodeGenConfigService;
-import org.nl.system.service.generator.dao.CodeGenConfig;
-import org.nl.system.service.generator.dao.mapper.CodeGenConfigMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-
-/**
- * <p>
- * 代码生成配置表 服务实现类
- * </p>
- *
- * @author lyd
- * @since 2023-05-03
- */
-@Service
-public class CodeGenConfigServiceImpl extends ServiceImpl<CodeGenConfigMapper, CodeGenConfig> implements ICodeGenConfigService {
-
-    @Autowired
-    private CodeGenConfigMapper codeGenConfigMapper;
-
-    @Override
-    public CodeGenConfig findByTableName(String tableName) {
-        CodeGenConfig codeGenConfig = codeGenConfigMapper.selectOne(new LambdaQueryWrapper<CodeGenConfig>()
-                .eq(CodeGenConfig::getTable_name, tableName));
-        if (ObjectUtil.isEmpty(codeGenConfig)) {
-            return new CodeGenConfig(tableName);
-        }
-        return codeGenConfig;
-    }
-
-    @Override
-    public CodeGenConfig update(String tableName, CodeGenConfig genConfig) {
-        // 如果 api 路径为空，则自动生成路径
-        if(StrUtil.isEmpty(genConfig.getApi_path())){
-            String separator = File.separator;
-            String[] paths;
-            String symbol = "\\";
-            if (symbol.equals(separator)) {
-                paths = genConfig.getPath().split("\\\\");
-            } else {
-                paths = genConfig.getPath().split(File.separator);
-            }
-            StringBuilder api = new StringBuilder();
-            for (String path : paths) {
-                api.append(path);
-                api.append(separator);
-                if ("src".equals(path)) {
-                    api.append("api");
-                    break;
-                }
-            }
-            genConfig.setApi_path(api.toString());
-        }
-        if (ObjectUtil.isNotEmpty(genConfig.getConfig_id())) {
-            codeGenConfigMapper.updateById(genConfig);
-        } else {
-            genConfig.setConfig_id(IdUtil.getSnowflake(1,1).nextIdStr());
-            codeGenConfigMapper.insert(genConfig);
-        }
-        return genConfig;
-    }
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java
deleted file mode 100644
index 0a828ab..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.nl.system.service.generator.impl;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.ZipUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.exception.BadRequestException;
-import org.nl.common.utils.FileUtil;
-import org.nl.common.utils.GenUtil;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.generator.ICodeGeneratorService;
-import org.nl.system.service.generator.dao.CodeColumnConfig;
-import org.nl.system.service.generator.dao.CodeGenConfig;
-import org.nl.system.service.generator.dao.mapper.CodeColumnConfigMapper;
-import org.nl.system.service.generator.dto.ColumnInfo;
-import org.nl.system.service.generator.dto.TablesInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 列的数据信息表 服务实现类
- * </p>
- *
- * @author lyd
- * @since 2023-05-03
- */
-@Service
-public class CodeGeneratorServiceImpl extends ServiceImpl<CodeColumnConfigMapper, CodeColumnConfig> implements ICodeGeneratorService {
-
-    @Autowired
-    private CodeColumnConfigMapper columnConfigMapper;
-
-    @Override
-    public IPage<TablesInfo> getTables(String name, PageQuery pageQuery) {
-        IPage<TablesInfo> pages = new Page<>();
-        int page = pageQuery.getPage();
-        int pageSize = pageQuery.getSize();
-        int offset = page * pageSize;
-        List<TablesInfo> tableInfos = columnConfigMapper.getTables(name, pageSize, offset);
-        long num = columnConfigMapper.getTablesTotal(name);
-        pages.setRecords(tableInfos);
-        pages.setCurrent(page + 1);
-        pages.setSize(pageSize);
-        pages.setTotal(num);
-        return pages;
-    }
-
-    @Override
-    public IPage<CodeColumnConfig> getColumns(String tableName) {
-        IPage<CodeColumnConfig> pages = new Page<>();
-        // 查找行列数据表
-        List<CodeColumnConfig> codeColumnConfigs = columnConfigMapper
-                .selectList(new LambdaQueryWrapper<CodeColumnConfig>()
-                        .eq(CodeColumnConfig::getTable_name, tableName));
-        if (ObjectUtil.isEmpty(codeColumnConfigs)) {
-            // 为空查找全新的数据
-            codeColumnConfigs = query(tableName);
-            // 保存
-            this.saveBatch(codeColumnConfigs);
-        }
-        pages.setRecords(codeColumnConfigs);
-        return pages;
-    }
-
-    @Override
-    public List<CodeColumnConfig> query(String tableName) {
-        List<ColumnInfo> columnConfigList = columnConfigMapper.getTablesByTableName(tableName);
-        // 设置默认值
-        List<CodeColumnConfig> columnInfos = columnConfigList.stream()
-                .map(config -> CodeColumnConfig.createDefault(tableName, config))
-                .collect(Collectors.toList());
-        return columnInfos;
-    }
-
-    @Override
-    public void sync(IPage<CodeColumnConfig> columnInfos, List<CodeColumnConfig> columnInfoList) {
-        List<CodeColumnConfig> records = columnInfos.getRecords();
-        // 第一种情况，数据库类字段改变或者新增字段
-        for (CodeColumnConfig columnInfo : columnInfoList) {
-            // 根据字段名称查找
-            List<CodeColumnConfig> columns = records.stream().filter(c -> c.getColumn_name().equals(columnInfo.getColumn_name())).collect(Collectors.toList());
-            // 如果能找到，就修改部分可能被字段
-            if (CollectionUtil.isNotEmpty(columns)) {
-                CodeColumnConfig column = columns.get(0);
-                column.setColumn_type(columnInfo.getColumn_type());
-                column.setExtra(columnInfo.getExtra());
-                column.setKey_type(columnInfo.getKey_type());
-                if (StrUtil.isEmpty(column.getRemark())) {
-                    column.setRemark(columnInfo.getRemark());
-                }
-                columnConfigMapper.updateById(column);
-            } else {
-                // 如果找不到，则保存新字段信息
-                columnConfigMapper.insert(columnInfo);
-            }
-        }
-        // 第二种情况，数据库字段删除了
-        for (CodeColumnConfig columnInfo : records) {
-            // 根据字段名称查找
-            List<CodeColumnConfig> columns = columnInfoList.stream().filter(c -> c.getColumn_name().equals(columnInfo.getColumn_name())).collect(Collectors.toList());
-            // 如果找不到，就代表字段被删除了，则需要删除该字段
-            if (CollectionUtil.isEmpty(columns)) {
-                columnConfigMapper.deleteById(columnInfo.getColumn_id());
-            }
-        }
-    }
-
-    @Override
-    public ResponseEntity<Object> preview(CodeGenConfig genConfig, IPage<CodeColumnConfig> columns) {
-        List<CodeColumnConfig> columnsRecords = columns.getRecords();
-        if (genConfig.getConfig_id() == null) {
-            throw new BadRequestException(LangProcess.msg("genrator_cfg"));
-        }
-        List<Map<String, Object>> genList = GenUtil.preview(columnsRecords, genConfig);
-        return new ResponseEntity<>(genList, HttpStatus.OK);
-    }
-
-    @Override
-    public void download(CodeGenConfig genConfig, IPage<CodeColumnConfig> columnsPage, HttpServletRequest request, HttpServletResponse response) {
-        List<CodeColumnConfig> columns = columnsPage.getRecords();
-        if (genConfig.getConfig_id() == null) {
-            throw new BadRequestException(LangProcess.msg("genrator_cfg"));
-        }
-        try {
-            File file = new File(GenUtil.download(columns, genConfig));
-            String zipPath = file.getPath() + ".zip";
-            ZipUtil.zip(file.getPath(), zipPath);
-            FileUtil.downloadFile(request, response, new File(zipPath), true);
-        } catch (IOException e) {
-            throw new BadRequestException(LangProcess.msg("error_SystemError"));
-        }
-    }
-
-    @Override
-    public void generator(CodeGenConfig genConfig, IPage<CodeColumnConfig> columnsPage) {
-        List<CodeColumnConfig> columns = columnsPage.getRecords();
-        if (genConfig.getConfig_id() == null) {
-            throw new BadRequestException(LangProcess.msg("genrator_cfg"));
-        }
-        try {
-            GenUtil.generatorCode(columns, genConfig);
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-            throw new BadRequestException(LangProcess.msg("error_SystemError"));
-        }
-    }
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/DeviceInfoController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/DeviceInfoController.java
deleted file mode 100644
index 30b8a9e..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/DeviceInfoController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.nl.wms.basedata_manage.controller;
-
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.base.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.logging.annotation.Log;
-import org.nl.wms.basedata_manage.service.IEmBiDeviceinfoService;
-import org.nl.wms.basedata_manage.service.dao.EmBiDeviceinfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * <p>
- * 设备基础信息表 控制层
- * </p>
- *
- * @author Liuxy
- * @since 2025-05-14
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/api/deviceinfo")
-@Slf4j
-public class DeviceInfoController {
-
-    @Autowired
-    private IEmBiDeviceinfoService iEmBiDeviceinfoService;
-
-    @GetMapping
-    @Log("查询设备")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
-        return new ResponseEntity<>(TableDataInfo.build(iEmBiDeviceinfoService.queryAll(whereJson, page)), HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增设备")
-    public ResponseEntity<Object> create(@Validated @RequestBody EmBiDeviceinfo dto) {
-        iEmBiDeviceinfoService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改设备")
-    public ResponseEntity<Object> update(@Validated @RequestBody EmBiDeviceinfo dto) {
-        iEmBiDeviceinfoService.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @DeleteMapping
-    @Log("删除设备")
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
-        iEmBiDeviceinfoService.delete(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
index 927fee4..7218c55 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructattrController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructattrController.java
index 624b0b3..caa1a04 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructattrController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructattrController.java
@@ -16,6 +16,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -58,7 +59,7 @@ public class StructattrController {
     @Log("删除仓位")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
-        structattrService.deleteAll(ids);
+        structattrService.removeByIds(Arrays.asList(ids));
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IEmBiDeviceinfoService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IEmBiDeviceinfoService.java
deleted file mode 100644
index 3082efe..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IEmBiDeviceinfoService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.nl.wms.basedata_manage.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.basedata_manage.service.dao.EmBiDeviceinfo;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * <p>
- * 生产设备基础信息表 服务类
- * </p>
- *
- * @author Liuxy
- * @since 2025-05-14
- */
-public interface IEmBiDeviceinfoService extends IService<EmBiDeviceinfo> {
-
-    /**
-     * 分页查询
-     * @param whereJson : {查询参数}
-     * @param pageable : 分页对象
-     * @return 返回结果
-     */
-    IPage<EmBiDeviceinfo> queryAll(Map whereJson, PageQuery pageable);
-
-    /**
-     *  新增设备
-     * @param dto 实体类
-     */
-    void create(EmBiDeviceinfo dto);
-
-    /**
-     * 修改设备
-     * @param dto 实体类
-     */
-    void update(EmBiDeviceinfo dto);
-
-    /**
-     * 删除设备
-     * @param ids 设备标识集合
-     */
-    void delete(Set<String> ids);
-
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java
index 7ce29c0..4cd2aa4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java
@@ -69,12 +69,6 @@ public interface IStructattrService extends IService<Structattr> {
      */
     void update(Structattr dto);
 
-    /**
-     * 多选删除
-     *
-     * @param ids /
-     */
-    void deleteAll(String[] ids);
 
     /**
      * 改变启用状态
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/EmBiDeviceinfo.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/EmBiDeviceinfo.java
deleted file mode 100644
index ada3c17..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/EmBiDeviceinfo.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.nl.wms.basedata_manage.service.dao;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 生产设备基础信息表
- * </p>
- *
- * @author Liuxy
- * @since 2025-05-14
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("em_bi_deviceinfo")
-public class EmBiDeviceinfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 设备标识
-     */
-    @TableId(value = "device_id")
-    private String device_id;
-
-    /**
-     * 设备编码
-     */
-    private String device_code;
-
-    /**
-     * 设备名称
-     */
-    private String device_name;
-
-    /**
-     * 设备型号
-     */
-    private String device_model;
-
-    /**
-     * 设备规格
-     */
-    private String device_specification;
-
-    /**
-     * 供应商
-     */
-    private String manufacturer;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 是否启用
-     */
-    private String is_used;
-
-    /**
-     * 外部编码
-     */
-    private String extend_code;
-
-    /**
-     * 创建人
-     */
-    private String create_id;
-
-    /**
-     * 创建人姓名
-     */
-    private String create_name;
-
-    /**
-     * 创建时间
-     */
-    private String create_time;
-
-    /**
-     * 修改人
-     */
-    private String update_optid;
-
-    /**
-     * 修改人名称
-     */
-    private String update_optname;
-
-    /**
-     * 修改时间
-     */
-    private String update_time;
-
-    /**
-     * 是否删除
-     */
-    private String is_delete;
-
-    /**
-     * 工厂
-     */
-    private String factory;
-
-    /**
-     * 生产规划
-     */
-    private String manufactureplanning;
-
-    /**
-     * 生产区域
-     */
-    private String manufacturearea;
-
-    /**
-     * 外部设备编码
-     */
-    private String extend_code_mes;
-
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java
index fab074c..4009b7a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @author dsh
@@ -140,31 +139,6 @@ public class Structattr implements Serializable {
      */
     private Integer block_num;
 
-    /**
-     * 入库顺序
-     */
-    private Integer in_order_seq;
-
-    /**
-     * 出库顺序
-     */
-    private Integer out_order_seq;
-
-    /**
-     * 入空载具顺序
-     */
-    private Integer in_empty_seq;
-
-    /**
-     * 出空载具顺序
-     */
-    private Integer out_empty_seq;
-
-    /**
-     * 放置类型
-     */
-    private String placement_type;
-
     /**
      * 创建人
      */
@@ -183,58 +157,28 @@ public class Structattr implements Serializable {
     /**
      * 修改人
      */
-    private String update_optid;
+    private String update_id;
 
     /**
      * 修改人姓名
      */
-    private String update_optname;
+    private String update_name;
 
     /**
      * 修改时间
      */
     private String update_time;
 
-    /**
-     * 是否删除
-     */
-    private String is_delete;
-
-    /**
-     * 背景色
-     */
-    private String back_ground_color;
-
-    /**
-     * 前景色
-     */
-    private String front_ground_color;
-
-    /**
-     * 背景图片
-     */
-    private String back_ground_pic;
-
-    /**
-     * 字体显示方向
-     */
-    private String font_direction_scode;
-
     /**
      * 是否启用
      */
-    private String is_used;
+    private Boolean is_used;
 
     /**
      * 是否判断高度
      */
     private String is_zdepth;
 
-    /**
-     * 存储载具标识
-     */
-    private Long storagevehicle_id;
-
     /**
      * 存储载具号
      */
@@ -245,11 +189,6 @@ public class Structattr implements Serializable {
      */
     private String storagevehicle_type;
 
-    /**
-     * 是否空载具
-     */
-    private String is_emptyvehicle;
-
     /**
      * 载具数量
      */
@@ -260,16 +199,6 @@ public class Structattr implements Serializable {
      */
     private String lock_type;
 
-    /**
-     * 锁定任务类型
-     */
-    private String taskdtl_type;
-
-    /**
-     * 锁定任务明细标识
-     */
-    private String taskdtl_id;
-
     /**
      * 锁定任务编码
      */
@@ -290,11 +219,6 @@ public class Structattr implements Serializable {
      */
     private String inv_code;
 
-    /**
-     * 物料高度类型
-     */
-    private String material_height_type;
-
     /**
      * 外部标识
      */
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/StructattrVechielDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/StructattrVechielDto.java
index 730f4f3..e6a8533 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/StructattrVechielDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/StructattrVechielDto.java
@@ -1,7 +1,7 @@
 package org.nl.wms.basedata_manage.service.dao;
 
 import lombok.Data;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
 
 import java.math.BigDecimal;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/EmBiDeviceinfoMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/EmBiDeviceinfoMapper.java
deleted file mode 100644
index 3e95b8b..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/EmBiDeviceinfoMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.basedata_manage.service.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.basedata_manage.service.dao.EmBiDeviceinfo;
-
-/**
- * <p>
- * 生产设备基础信息表 Mapper 接口
- * </p>
- *
- * @author author
- * @since 2025-05-14
- */
-public interface EmBiDeviceinfoMapper extends BaseMapper<EmBiDeviceinfo> {
-
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/EmBiDeviceinfoMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/EmBiDeviceinfoMapper.xml
deleted file mode 100644
index 000720f..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/EmBiDeviceinfoMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.basedata_manage.service.dao.mapper.EmBiDeviceinfoMapper">
-
-</mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/BsrealStorattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/BsrealStorattrServiceImpl.java
index 4f1e171..5d896b9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/BsrealStorattrServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/BsrealStorattrServiceImpl.java
@@ -3,16 +3,12 @@ package org.nl.wms.basedata_manage.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.IdUtil;
@@ -26,15 +22,10 @@ import org.nl.wms.basedata_manage.service.dao.BsrealStorattrDto;
 import org.nl.wms.basedata_manage.service.dao.Sectattr;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.basedata_manage.service.dao.mapper.BsrealStorattrMapper;
-import org.nl.wms.basedata_manage.service.dao.mapper.SectattrMapper;
-import org.nl.wms.basedata_manage.service.dao.mapper.StructattrMapper;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -210,8 +201,8 @@ public class BsrealStorattrServiceImpl extends ServiceImpl<BsrealStorattrMapper,
 
         iStructattrService.update(new LambdaUpdateWrapper<>(Structattr.class)
                 .set(Structattr::getIs_used, is_used)
-                .set(Structattr::getUpdate_optid, currentUserId)
-                .set(Structattr::getUpdate_optname, nickName)
+                .set(Structattr::getUpdate_id, currentUserId)
+                .set(Structattr::getUpdate_name, nickName)
                 .set(Structattr::getUpdate_time, now)
                 .eq(Structattr::getStor_id, stor_id)
         );
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/EmBiDeviceinfoServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/EmBiDeviceinfoServiceImpl.java
deleted file mode 100644
index b5450e8..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/EmBiDeviceinfoServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.nl.wms.basedata_manage.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.exception.BadRequestException;
-import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.basedata_manage.enums.BaseDataEnum;
-import org.nl.wms.basedata_manage.service.IEmBiDeviceinfoService;
-import org.nl.wms.basedata_manage.service.dao.EmBiDeviceinfo;
-import org.nl.wms.basedata_manage.service.dao.mapper.EmBiDeviceinfoMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * <p>
- * 生产设备基础信息表 服务实现类
- * </p>
- *
- * @author Liuxy
- * @since 2025-05-14
- */
-@Service
-public class EmBiDeviceinfoServiceImpl extends ServiceImpl<EmBiDeviceinfoMapper, EmBiDeviceinfo> implements IEmBiDeviceinfoService {
-
-    @Override
-    public IPage<EmBiDeviceinfo> queryAll(Map whereJson, PageQuery page) {
-        // 查询条件
-        LambdaQueryWrapper<EmBiDeviceinfo> queryWrapper = new QueryWrapper<EmBiDeviceinfo>().lambda();
-        String search = MapUtil.getStr(whereJson, "search");
-
-        if (ObjectUtil.isNotEmpty(search)) {
-            queryWrapper.likeRight(EmBiDeviceinfo::getDevice_code, search)
-                    .or(item -> item.likeRight(EmBiDeviceinfo::getDevice_name, search));
-        }
-        queryWrapper.eq(EmBiDeviceinfo::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否"));
-        queryWrapper.orderByDesc(EmBiDeviceinfo::getUpdate_time);
-
-        return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()),
-                queryWrapper
-        );
-    }
-
-    @Override
-    @Transactional
-    public void create(EmBiDeviceinfo dto) {
-        EmBiDeviceinfo emBiDeviceinfo = this.baseMapper.selectOne(
-                new QueryWrapper<EmBiDeviceinfo>().lambda()
-                        .eq(EmBiDeviceinfo::getDevice_code, dto.getDevice_code())
-        );
-        if (ObjectUtil.isNotEmpty(emBiDeviceinfo)) {
-            throw new BadRequestException("当前设备编码已存在【"+dto.getDevice_code()+"】");
-        }
-
-        // 新增
-        dto.setDevice_id(IdUtil.getStringId());
-        dto.setCreate_id(SecurityUtils.getCurrentUserId());
-        dto.setCreate_name(SecurityUtils.getCurrentNickName());
-        dto.setCreate_time(DateUtil.now());
-        dto.setUpdate_optid(SecurityUtils.getCurrentUserId());
-        dto.setUpdate_optname(SecurityUtils.getCurrentNickName());
-        dto.setUpdate_time(DateUtil.now());
-        this.save(dto);
-    }
-
-    @Override
-    @Transactional
-    public void update(EmBiDeviceinfo dto) {
-        EmBiDeviceinfo emBiDeviceinfo = this.baseMapper.selectById(dto.getDevice_id());
-        if (ObjectUtil.isEmpty(emBiDeviceinfo)) {
-            throw new BadRequestException("被删除或无权限，操作失败!");
-        }
-
-        // 修改
-        dto.setUpdate_optid(SecurityUtils.getCurrentUserId());
-        dto.setUpdate_optname(SecurityUtils.getCurrentNickName());
-        dto.setUpdate_time(DateUtil.now());
-        this.updateById(dto);
-    }
-
-    @Override
-    @Transactional
-    public void delete(Set<String> ids) {
-        this.baseMapper.deleteBatchIds(ids);
-    }
-}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
index 2fbc4bf..55c6fc9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
@@ -16,7 +16,7 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
 import org.nl.wms.basedata_manage.service.dao.mapper.MdMeMaterialbaseMapper;
-import org.nl.wms.ext.service.WmsToErpService;
+import org.nl.wms.ext_manage.service.WmsToErpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleextServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleextServiceImpl.java
index c313438..8df7bb4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleextServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleextServiceImpl.java
@@ -8,11 +8,8 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleextService;
 import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleext;
 import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper;
-import org.nl.wms.warehouse_management.service.util.UpdateIvtUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java
index 877e24e..aafb40e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java
@@ -3,7 +3,6 @@ package org.nl.wms.basedata_manage.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -23,15 +22,11 @@ import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
 import org.nl.wms.basedata_manage.service.dao.Sectattr;
 import org.nl.wms.basedata_manage.service.dao.SectattrDto;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
-import org.nl.wms.basedata_manage.service.dao.mapper.BsrealStorattrMapper;
 import org.nl.wms.basedata_manage.service.dao.mapper.SectattrMapper;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -240,8 +235,8 @@ public class SectattrServiceImpl extends ServiceImpl<SectattrMapper, Sectattr> i
 
         iStructattrService.update(new LambdaUpdateWrapper<>(Structattr.class)
                 .set(Structattr::getIs_used, is_used)
-                .set(Structattr::getUpdate_optid, currentUserId)
-                .set(Structattr::getUpdate_optname, nickName)
+                .set(Structattr::getUpdate_id, currentUserId)
+                .set(Structattr::getUpdate_name, nickName)
                 .set(Structattr::getUpdate_time, now)
                 .eq(Structattr::getSect_id, sect_id)
         );
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
index fcfebbf..431a644 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
@@ -4,11 +4,9 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
@@ -35,8 +32,7 @@ import org.nl.wms.decision_manage.service.sectStrategy.IStSectStrategyService;
 import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy;
 import org.nl.wms.decision_manage.service.strategyConfig.decisioner.Decisioner;
 import org.nl.wms.sch_manage.enums.StatusEnum;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.dao.IOStorInv;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,9 +40,6 @@ import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -92,7 +85,6 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
                 .eq(StrUtil.isNotEmpty(lock_type),Structattr::getLock_type, lock_type)
                 .eq(StrUtil.isNotEmpty(layer_num),Structattr::getLayer_num, layer_num)
                 .eq(StrUtil.isNotEmpty(is_used),Structattr::getIs_used, is_used)
-                .eq(Structattr::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否"))
                 .isNull("1".equals(is_have),Structattr::getStoragevehicle_code)
                 .isNotNull("2".equals(is_have),Structattr::getStoragevehicle_code)
                 .orderByAsc(Structattr::getStruct_code)
@@ -123,7 +115,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
     public void create(Structattr dto) {
         String struct_code = dto.getStruct_code();
         Structattr structattr = this.findByCode(struct_code);
-        if (structattr != null && BaseDataEnum.IS_YES_NOT.code("否").equals(structattr.getIs_delete())) {
+        if (structattr != null ) {
             throw new BadRequestException("存在相同的库区编号");
         }
         String currentUserId = SecurityUtils.getCurrentUserId();
@@ -133,8 +125,8 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
         dto.setStruct_id(IdUtil.getStringId());
         dto.setCreate_id(currentUserId);
         dto.setCreate_name(nickName);
-        dto.setUpdate_optid(currentUserId);
-        dto.setUpdate_optname(nickName);
+        dto.setUpdate_id(currentUserId);
+        dto.setUpdate_name(nickName);
         dto.setUpdate_time(now);
         dto.setCreate_time(now);
 
@@ -174,7 +166,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
 
         String struct_code = dto.getStruct_code();
         Structattr structattr = this.findByCode(struct_code);
-        if (structattr != null && !dto.getStruct_id().equals(structattr.getStruct_id()) && BaseDataEnum.IS_YES_NOT.code("否").equals(structattr.getIs_delete())) {
+        if (structattr != null && !dto.getStruct_id().equals(structattr.getStruct_id())) {
             throw new BadRequestException("存在相同的库区编号");
         }
 
@@ -183,8 +175,8 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
 
         String now = DateUtil.now();
         dto.setUpdate_time(now);
-        dto.setUpdate_optid(currentUserId);
-        dto.setUpdate_optname(nickName);
+        dto.setUpdate_id(currentUserId);
+        dto.setUpdate_name(nickName);
         Sectattr sectattr = iSectattrService.findById(dto.getSect_id());
         BsrealStorattr bsrealStorattr = iBsrealStorattrService.findById(sectattr.getStor_id());
         dto.setSect_code(sectattr.getSect_code());
@@ -196,23 +188,6 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
         structattrMapper.updateById(dto);
     }
 
-    @Override
-    public void deleteAll(String[] ids) {
-        String currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getCurrentNickName();
-        String now = DateUtil.now();
-
-        for (String struct_id : ids) {
-            Structattr structattr = new Structattr();
-            structattr.setStruct_id(struct_id);
-            structattr.setIs_delete(BaseDataEnum.IS_YES_NOT.code("是"));
-            structattr.setUpdate_optid(currentUserId);
-            structattr.setUpdate_optname(nickName);
-            structattr.setUpdate_time(now);
-            structattrMapper.updateById(structattr);
-        }
-    }
-
     @Override
     public void changeActive(JSONObject json) {
         String sect_id = json.getString("sect_id");
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java
new file mode 100644
index 0000000..a67ae74
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java
@@ -0,0 +1,40 @@
+package org.nl.wms.bigscreen_manage.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.logging.annotation.Log;
+import org.nl.wms.bigscreen_manage.service.BigScreenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 大屏显示 控制层
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-06-24
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/bigScreen")
+@Slf4j
+public class BigScreenController {
+
+    @Autowired
+    private BigScreenService bigScreenService;
+
+    @PostMapping("/getData")
+    @Log("大屏数据")
+    @SaIgnore
+    public ResponseEntity<Object> getData() {
+        return new ResponseEntity<>(bigScreenService.getData(null), HttpStatus.OK);
+    }
+
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/BigScreenService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/BigScreenService.java
new file mode 100644
index 0000000..d402267
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/BigScreenService.java
@@ -0,0 +1,22 @@
+package org.nl.wms.bigscreen_manage.service;
+
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * <p>
+ * 大屏显示 服务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-06-24
+ */
+public interface BigScreenService {
+
+    /**
+     * 获取大屏数据
+     *根据配置的仓库
+     * @return PdaResponse
+     */
+    JSONObject getData(String[] stors);
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java
new file mode 100644
index 0000000..7db6d6c
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java
@@ -0,0 +1,376 @@
+package org.nl.wms.bigscreen_manage.service.impl;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.nl.common.utils.MapOf;
+import org.nl.wms.basedata_manage.service.IStructattrService;
+import org.nl.wms.basedata_manage.service.dao.Structattr;
+import org.nl.wms.basedata_manage.service.dao.StructattrVechielDto;
+import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper;
+import org.nl.wms.bigscreen_manage.service.BigScreenService;
+import org.nl.wms.pda_manage.util.PdaResponse;
+import org.nl.wms.sch_manage.enums.TaskStatus;
+import org.nl.wms.sch_manage.service.ISchBaseTaskService;
+import org.nl.wms.sch_manage.service.dao.SchBaseTask;
+import org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 大屏显示 实现类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-06-24
+ */
+@Service
+public class BigScreenServiceImpl implements BigScreenService {
+
+    /**
+     * 仓位服务
+     */
+    @Autowired
+    private IStructattrService iStructattrService;
+
+    /**
+     * 载具扩展属性mapper服务
+     */
+    @Autowired
+    private MdPbStoragevehicleextMapper mdPbStoragevehicleextMapper;
+
+    /**
+     * 任务服务
+     */
+    @Autowired
+    private ISchBaseTaskService iSchBaseTaskService;
+
+    @Override
+    public JSONObject getData(String[] stors) {
+//        String storCode = "GW";
+        JSONObject result = new JSONObject();
+//        //1.【货位使用】数据
+//        result.put("pointUse", pointUse(storCode));
+//        //2.【实时库存分析】数据
+//        result.put("ivtAnalyse", ivtAnalyse(storCode));
+//        //3.【出入库趋势】数据
+//        result.put("inAndOutTrend", inAndOutTrend(storCode));
+//        //4.【今日出入库】数据
+//        result.put("toDayInAndOut", toDayInAndOut(storCode));
+//        //5.【今日出入库】数据
+//        result.put("realTask", realTask(storCode));
+//        //6.【未完成单据】数据
+//        result.put("unIos", unIos(storCode));
+        return result;
+    }
+    /**
+//
+//     * 货位使用
+//     *
+//     * @return JSONObject {
+//     * total_qty: 总货位数
+//     * use_qty: 已用货位
+//     * emp_qty: 空余货位
+//     * use_percentage: 百分比（使用货位百分比）
+//     * }
+//     */
+//    private JSONObject pointUse(String storCode) {
+//        // 返回数据
+//        JSONObject result = new JSONObject();
+//        // 查询所有未删除且启用仓位
+//        int emp_qty = iStructattrService.count(
+//                new QueryWrapper<Structattr>().lambda()
+//                        .eq(Structattr::getIs_used, Boolean.TRUE)
+//                        .eq(Structattr::getStor_code, storCode)
+//                        .isNull(Structattr::getStoragevehicle_code));
+//        int use_qty = iStructattrService.count(
+//                new QueryWrapper<Structattr>().lambda()
+//                        .eq(Structattr::getIs_used, Boolean.TRUE)
+//                        .eq(Structattr::getStor_code, storCode)
+//                        .isNotNull(Structattr::getStoragevehicle_code));
+//        int total_qty = iStructattrService.count(
+//                new QueryWrapper<Structattr>().lambda()
+//                        .eq(Structattr::getIs_used, Boolean.TRUE)
+//                        .eq(Structattr::getStor_code, storCode));
+//        // 总货位数
+//        result.put("total_qty", total_qty);
+//        // 已用货位数
+//        result.put("use_qty", use_qty);
+//        // 空余货位
+//        result.put("emp_qty", emp_qty);
+//        // 使用货位百分比
+//        double use_percentage = NumberUtil.mul(NumberUtil.div(use_qty, total_qty), 100);
+//        result.put("use_percentage", NumberUtil.round(use_percentage, 2));
+//        return result;
+//    }
+//
+//    /**
+//     * 实时库存分析
+//     *
+//     * @return JSONObject {
+//     * total_qty: 总数
+//     * data: [
+//     * material_name: 物料名称
+//     * ivt_qty: 库存数量
+//     * percentage: 百分比
+//     * ]
+//     * }
+//     */
+//    private JSONObject ivtAnalyse(String storCode) {
+//        // 返回数据
+//        JSONObject result = new JSONObject();
+//        // 查询所有库存
+//        List<StructattrVechielDto> vechielDtos = iStructattrService.collectVechicle(MapOf.of("stor_code", storCode));
+//        // 总数
+//        double total_qty = ivtList.stream()
+//                .map(row -> row.getDoubleValue("canuse_qty"))
+//                .reduce(Double::sum).orElse(0.0);
+//        result.put("total_qty", NumberUtil.round(total_qty, 2));
+//
+//        // 查询排名前五的物料库存
+//        List<JSONObject> topFiveList;
+//        List<JSONObject> otherList = null;
+//        if (ivtList.size() < 5) {
+//            topFiveList = ivtList;
+//        } else {
+//            topFiveList = ivtList.subList(0, 5);
+//            otherList = ivtList.subList(5, ivtList.size());
+//        }
+//        // 组织数据（物料前五）
+//        for (JSONObject json : topFiveList) {
+//            // 库存数量
+//            json.put("ivt_qty", NumberUtil.round(json.getDoubleValue("canuse_qty"), 2));
+//            // 百分比
+//            double percentage = NumberUtil.mul(NumberUtil.div(json.getDoubleValue("canuse_qty"), total_qty), 100);
+//            json.put("percentage", NumberUtil.round(percentage, 2));
+//        }
+//
+//        // 计算其他物料
+//        if (ObjectUtil.isNotEmpty(otherList)) {
+//            JSONObject jsonOther = new JSONObject();
+//            jsonOther.put("material_name", "其他");
+//            double ivt_qty = otherList.stream()
+//                    .map(row -> row.getDoubleValue("canuse_qty"))
+//                    .reduce(Double::sum).orElse(0.0);
+//            jsonOther.put("ivt_qty", NumberUtil.round(ivt_qty, 2));
+//            // 百分比
+//            double percentage = NumberUtil.mul(NumberUtil.div(ivt_qty, total_qty), 100);
+//            jsonOther.put("percentage", NumberUtil.round(percentage, 2));
+//            topFiveList.add(jsonOther);
+//        }
+//
+//        result.put("data", topFiveList);
+//        return result;
+//    }
+//
+//    /**
+//     * 出入库趋势
+//     *
+//     * @return JSONObject {
+//     * in: [{date:日期，qty:数量}]
+//     * out: [{date:日期，qty:数量}]
+//     * }
+//     */
+//    private JSONObject inAndOutTrend() {
+//        // 获取七天天数集合
+//        DateTime dateTime = DateUtil.offsetDay(DateUtil.parseDate(DateUtil.today()), -6);
+//        List<String> dateList = DateUtil.rangeToList(dateTime, DateUtil.parse(DateUtil.today()), DateField.DAY_OF_YEAR).stream()
+//                .map(DateTime::toString)
+//                .map(row -> row.substring(0, 10))
+//                .collect(Collectors.toList());
+//        // 查询七天内的出入库数据
+//        List<IOStorInv> allIosList = iOutBillService.list(
+//                new QueryWrapper<IOStorInv>().lambda()
+//                        .in(IOStorInv::getBiz_date, dateList)
+//                        .eq(IOStorInv::getIs_delete, IOSConstant.IS_DELETE_NO)
+//                        .eq(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
+//        );
+//
+//        // 查询入库单据
+//        List<IOStorInv> inIosList = allIosList.stream()
+//                .filter(row -> row.getIo_type().equals(IOSEnum.IO_TYPE.code("入库")))
+//                .collect(Collectors.toList());
+//        // 查询出库单据
+//        List<IOStorInv> outIosList = allIosList.stream()
+//                .filter(row -> row.getIo_type().equals(IOSEnum.IO_TYPE.code("出库")))
+//                .collect(Collectors.toList());
+//        // 组织数据
+//        List<JSONObject> inList = new ArrayList<>();
+//        List<JSONObject> outList = new ArrayList<>();
+//        for (String date : dateList) {
+//            // 处理入库数量
+//            JSONObject jsonIn = new JSONObject();
+//            jsonIn.put("date", date);
+//            double in_qty = inIosList.stream()
+//                    .filter(row -> row.getBiz_date().equals(date))
+//                    .map(row -> row.getTotal_qty().doubleValue())
+//                    .reduce(Double::sum).orElse(0.00);
+//            jsonIn.put("qty", NumberUtil.round(in_qty, 2));
+//            inList.add(jsonIn);
+//
+//            // 处理出库数据
+//            JSONObject jsonOut = new JSONObject();
+//            jsonOut.put("date", date);
+//            double out_qty = outIosList.stream()
+//                    .filter(row -> row.getBiz_date().equals(date))
+//                    .map(row -> row.getTotal_qty().doubleValue())
+//                    .reduce(Double::sum).orElse(0.00);
+//            jsonOut.put("qty", NumberUtil.round(out_qty, 2));
+//            outList.add(jsonOut);
+//        }
+//
+//        JSONObject result = new JSONObject();
+//        result.put("in", inList);
+//        result.put("out", outList);
+//        return result;
+//    }
+//
+//    /**
+//     * 今日出入库
+//     *
+//     * @return JSONObject {
+//     * in: {total_qty:总数量，vehicle_qty:托盘数量}
+//     * out: {total_qty:总数量，vehicle_qty:托盘数量}
+//     * }
+//     */
+//    private JSONObject toDayInAndOut() {
+//        // 查询今天出入库单据
+//        List<IOStorInv> inList = iOutBillService.list(
+//                new QueryWrapper<IOStorInv>().lambda()
+//                        .eq(IOStorInv::getBiz_date, DateUtil.today())
+//                        .eq(IOStorInv::getIs_delete, IOSConstant.IS_DELETE_NO)
+//                        .eq(IOStorInv::getIo_type, IOSEnum.IO_TYPE.code("入库"))
+//                        .eq(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
+//        );
+//        // 查询今天出库单据
+//        List<IOStorInv> outList = iOutBillService.list(
+//                new QueryWrapper<IOStorInv>().lambda()
+//                        .eq(IOStorInv::getBiz_date, DateUtil.today())
+//                        .eq(IOStorInv::getIs_delete, IOSConstant.IS_DELETE_NO)
+//                        .eq(IOStorInv::getIo_type, IOSEnum.IO_TYPE.code("出库"))
+//                        .eq(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
+//        );
+//
+//        // 入库
+//        JSONObject jsonIn = new JSONObject();
+//        // 总数量
+//        double total_qty_in = inList.stream()
+//                .map(row -> row.getTotal_qty().doubleValue())
+//                .reduce(Double::sum).orElse(0.0);
+//        jsonIn.put("total_qty", NumberUtil.round(total_qty_in, 2));
+//
+//        // 托盘数
+//        List<IOStorInvDis> inDisList = new ArrayList<>();
+//        if (ObjectUtil.isNotEmpty(inList)) {
+//            inDisList = ioStorInvDisMapper.selectList(
+//                    new QueryWrapper<IOStorInvDis>().lambda()
+//                            .in(IOStorInvDis::getIostorinv_id, inList.stream()
+//                                    .map(IOStorInv::getIostorinv_id)
+//                                    .collect(Collectors.toList())
+//                            )
+//            );
+//        }
+//        jsonIn.put("vehicle_qty", inDisList.size());
+//
+//        // 出库
+//        JSONObject jsonOut = new JSONObject();
+//        // 总数量
+//        double total_qty_out = outList.stream()
+//                .map(row -> row.getTotal_qty().doubleValue())
+//                .reduce(Double::sum).orElse(0.0);
+//        jsonOut.put("total_qty", NumberUtil.round(total_qty_out, 2));
+//        // 托盘数
+//        List<IOStorInvDis> outDisList = new ArrayList<>();
+//        if (ObjectUtil.isNotEmpty(outList)) {
+//            outDisList = ioStorInvDisMapper.selectList(
+//                    new QueryWrapper<IOStorInvDis>().lambda()
+//                            .in(IOStorInvDis::getIostorinv_id, outList.stream()
+//                                    .map(IOStorInv::getIostorinv_id)
+//                                    .collect(Collectors.toList())
+//                            )
+//            );
+//        }
+//        jsonOut.put("vehicle_qty", outDisList.size());
+//
+//        JSONObject result = new JSONObject();
+//        result.put("in", jsonIn);
+//        result.put("out", jsonOut);
+//        return result;
+//    }
+//
+//    /**
+//     * 实时任务
+//     *
+//     * @return List<SchBaseTask> {
+//     * 任务实体列
+//     * }
+//     */
+//    private List<SchBaseTask> realTask() {
+//        List<SchBaseTask> list = iSchBaseTaskService.list(
+//                new QueryWrapper<SchBaseTask>().lambda()
+//                        .in(SchBaseTask::getTask_status, TaskStatus.CREATE.getCode()
+//                                , TaskStatus.ISSUED.getCode(), TaskStatus.EXECUTING.getCode()
+//                        )
+//                        .eq(SchBaseTask::getIs_delete, IOSConstant.IS_DELETE_NO)
+//        );
+//        list.stream().forEach(item -> {
+//            if (item.getTask_status().equals(TaskStatus.CREATE.getCode())) {
+//                item.setTask_status(TaskStatus.CREATE.getName());
+//            }
+//            if (item.getTask_status().equals(TaskStatus.ISSUED.getCode())) {
+//                item.setTask_status(TaskStatus.ISSUED.getName());
+//            }
+//            if (item.getTask_status().equals(TaskStatus.EXECUTING.getCode())) {
+//                item.setTask_status(TaskStatus.EXECUTING.getName());
+//            }
+//        });
+//
+//        return list;
+//    }
+//
+//    /**
+//     * 未完成单据
+//     *
+//     * @return List<IOStorInv>{
+//     * 出入库实体类
+//     * }
+//     */
+//    private List<IOStorInv> unIos() {
+//        List<Dict> dicts = sysDictMapper.selectList(
+//                new QueryWrapper<Dict>().lambda()
+//                        .in(Dict::getCode, "ST_INV_IN_TYPE", "ST_INV_OUT_TYPE")
+//        );
+//
+//        List<IOStorInv> list = iOutBillService.list(
+//                new QueryWrapper<IOStorInv>().lambda()
+//                        .eq(IOStorInv::getIs_delete, IOSConstant.IS_DELETE_NO)
+//                        .ne(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
+//        );
+//        list.stream().forEach(item -> {
+//            item.setIo_type(item.getIo_type().equals(IOSEnum.IO_TYPE.code("入库")) ? IOSConstant.IOS_IO_TYPE_IN : IOSConstant.IOS_IO_TYPE_OUT);
+//            if (item.getBill_status().equals(IOSEnum.BILL_STATUS.code("生成"))) {
+//                item.setBill_status("生成");
+//            }
+//            if (item.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配中"))) {
+//                item.setBill_status("分配中");
+//            }
+//            if (item.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完"))) {
+//                item.setBill_status("分配完");
+//            }
+//            Dict dict = dicts.stream()
+//                    .filter(row -> row.getValue().equals(item.getBill_type()))
+//                    .findFirst().orElse(null);
+//            item.setBill_type(dict.getLabel());
+//        });
+//        return list;
+//    }
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/DepthPriorityHandler.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/DepthPriorityHandler.java
index 38973e3..856dd3b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/DepthPriorityHandler.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/DepthPriorityHandler.java
@@ -10,7 +10,7 @@ import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.decision_manage.service.strategyConfig.decisioner.Decisioner;
 import org.nl.wms.sch_manage.enums.StatusEnum;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java
index 5ce0f50..9a1a897 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java
@@ -1,9 +1,9 @@
-package org.nl.wms.ext.controller;
+package org.nl.wms.ext_manage.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.ext.service.AcsToWmsService;
+import org.nl.wms.ext_manage.service.AcsToWmsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/ErpToWmsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/ErpToWmsController.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/ErpToWmsController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/ErpToWmsController.java
index 69f3d59..fdc0271 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/ErpToWmsController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/ErpToWmsController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.ext.controller;
+package org.nl.wms.ext_manage.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.ext.service.ErpToWmsService;
+import org.nl.wms.ext_manage.service.ErpToWmsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/enums/EXTConstant.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/enums/EXTConstant.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/enums/EXTConstant.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/enums/EXTConstant.java
index 528550b..7ae9132 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/enums/EXTConstant.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/enums/EXTConstant.java
@@ -1,4 +1,4 @@
-package org.nl.wms.ext.enums;
+package org.nl.wms.ext_manage.enums;
 
 /**
  * @author Liuyx
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/enums/ResultAcsStatus.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/enums/ResultAcsStatus.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/enums/ResultAcsStatus.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/enums/ResultAcsStatus.java
index 1c71a32..7994fef 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/enums/ResultAcsStatus.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/enums/ResultAcsStatus.java
@@ -1,4 +1,4 @@
-package org.nl.wms.ext.enums;
+package org.nl.wms.ext_manage.enums;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/AcsToWmsService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/AcsToWmsService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java
index 65d24fe..e198180 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/AcsToWmsService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java
@@ -1,4 +1,4 @@
-package org.nl.wms.ext.service;
+package org.nl.wms.ext_manage.service;
 
 import java.util.Map;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/ErpToWmsService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/ErpToWmsService.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/ErpToWmsService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/ErpToWmsService.java
index ff88d42..1bddda1 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/ErpToWmsService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/ErpToWmsService.java
@@ -1,7 +1,7 @@
-package org.nl.wms.ext.service;
+package org.nl.wms.ext_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.ext.service.util.ErpResponse;
+import org.nl.wms.ext_manage.service.util.ErpResponse;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/WmsToAcsService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/WmsToAcsService.java
similarity index 79%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/WmsToAcsService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/WmsToAcsService.java
index dba20bf..9443acb 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/WmsToAcsService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/WmsToAcsService.java
@@ -1,7 +1,7 @@
-package org.nl.wms.ext.service;
+package org.nl.wms.ext_manage.service;
 
 
-import org.nl.wms.ext.service.util.AcsResponse;
+import org.nl.wms.ext_manage.service.util.AcsResponse;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/WmsToErpService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/WmsToErpService.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/WmsToErpService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/WmsToErpService.java
index 523c381..f529ddb 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/WmsToErpService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/WmsToErpService.java
@@ -1,4 +1,4 @@
-package org.nl.wms.ext.service;
+package org.nl.wms.ext_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java
index c82ac09..5eac0b0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java
@@ -1,12 +1,12 @@
-package org.nl.wms.ext.service.impl;
+package org.nl.wms.ext_manage.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
-import org.nl.wms.ext.enums.ResultAcsStatus;
-import org.nl.wms.ext.service.AcsToWmsService;
+import org.nl.wms.ext_manage.enums.ResultAcsStatus;
+import org.nl.wms.ext_manage.service.AcsToWmsService;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/ErpToWmsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/ErpToWmsServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java
index 28129c0..344242f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/ErpToWmsServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.ext.service.impl;
+package org.nl.wms.ext_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONArray;
@@ -13,10 +13,10 @@ import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
 import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
 import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper;
-import org.nl.wms.ext.service.ErpToWmsService;
-import org.nl.wms.ext.service.util.ErpResponse;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IOutBillService;
+import org.nl.wms.ext_manage.service.ErpToWmsService;
+import org.nl.wms.ext_manage.service.util.ErpResponse;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IOutBillService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToAcsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToAcsServiceImpl.java
similarity index 66%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToAcsServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToAcsServiceImpl.java
index 0b3b8a2..379f4d3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToAcsServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToAcsServiceImpl.java
@@ -1,10 +1,10 @@
-package org.nl.wms.ext.service.impl;
+package org.nl.wms.ext_manage.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.ext.enums.EXTConstant;
-import org.nl.wms.ext.service.WmsToAcsService;
-import org.nl.wms.ext.service.util.AcsResponse;
-import org.nl.wms.ext.util.AcsUtil;
+import org.nl.wms.ext_manage.enums.EXTConstant;
+import org.nl.wms.ext_manage.service.WmsToAcsService;
+import org.nl.wms.ext_manage.service.util.AcsResponse;
+import org.nl.wms.ext_manage.util.AcsUtil;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 import org.springframework.stereotype.Service;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToErpServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToErpServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java
index 2d2b430..9554590 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToErpServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java
@@ -1,14 +1,14 @@
-package org.nl.wms.ext.service.impl;
+package org.nl.wms.ext_manage.service.impl;
 
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
 import org.nl.config.SpringContextHolder;
-import org.nl.system.enums.SysParamConstant;
-import org.nl.system.service.param.impl.SysParamServiceImpl;
-import org.nl.wms.ext.enums.EXTConstant;
-import org.nl.wms.ext.service.WmsToErpService;
+import org.nl.wms.system_manage.enums.SysParamConstant;
+import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl;
+import org.nl.wms.ext_manage.enums.EXTConstant;
+import org.nl.wms.ext_manage.service.WmsToErpService;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/AcsResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/util/AcsResponse.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/AcsResponse.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/util/AcsResponse.java
index b5cd7e4..a9ecf56 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/AcsResponse.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/util/AcsResponse.java
@@ -1,10 +1,10 @@
-package org.nl.wms.ext.service.util;
+package org.nl.wms.ext_manage.service.util;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSONArray;
 import lombok.Data;
-import org.nl.wms.ext.util.BaseResponse;
+import org.nl.wms.ext_manage.util.BaseResponse;
 
 /**
  * @Author: Liuxy
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/ErpResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/util/ErpResponse.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/ErpResponse.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/util/ErpResponse.java
index 653f983..90d89b0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/ErpResponse.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/util/ErpResponse.java
@@ -1,4 +1,4 @@
-package org.nl.wms.ext.service.util;
+package org.nl.wms.ext_manage.service.util;
 
 import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSONObject;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/AcsUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/util/AcsUtil.java
similarity index 87%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/AcsUtil.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/util/AcsUtil.java
index 300ad13..a6a7ea0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/AcsUtil.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/util/AcsUtil.java
@@ -1,15 +1,15 @@
-package org.nl.wms.ext.util;
+package org.nl.wms.ext_manage.util;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.config.SpringContextHolder;
-import org.nl.system.enums.SysParamConstant;
-import org.nl.system.service.param.dao.Param;
-import org.nl.system.service.param.impl.SysParamServiceImpl;
-import org.nl.wms.ext.service.util.AcsResponse;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
+import org.nl.wms.system_manage.enums.SysParamConstant;
+import org.nl.wms.system_manage.service.param.dao.Param;
+import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl;
+import org.nl.wms.ext_manage.service.util.AcsResponse;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/BaseResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/util/BaseResponse.java
similarity index 98%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/BaseResponse.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/util/BaseResponse.java
index c296a8c..7456202 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/util/BaseResponse.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/util/BaseResponse.java
@@ -1,4 +1,4 @@
-package org.nl.wms.ext.util;
+package org.nl.wms.ext_manage.util;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpStatus;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/authorization/controller/AuthorizationsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/authorization/controller/AuthorizationsController.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/authorization/controller/AuthorizationsController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/authorization/controller/AuthorizationsController.java
index a44d787..d67cc88 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/authorization/controller/AuthorizationsController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/authorization/controller/AuthorizationsController.java
@@ -1,8 +1,8 @@
-package org.nl.wms.pda.authorization.controller;
+package org.nl.wms.pda_manage.authorization.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.system.service.menu.ISysMenuService;
+import org.nl.wms.system_manage.service.menu.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/controller/PdaIosCheckController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosCheckController.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/controller/PdaIosCheckController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosCheckController.java
index 21eb59b..6451069 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/controller/PdaIosCheckController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosCheckController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.ios_manage.controller;
+package org.nl.wms.pda_manage.ios_manage.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
@@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
-import org.nl.wms.pda.ios_manage.service.PdaIosCheckService;
-import org.nl.wms.pda.ios_manage.service.PdaIosInService;
+import org.nl.wms.pda_manage.ios_manage.service.PdaIosCheckService;
+import org.nl.wms.pda_manage.ios_manage.service.PdaIosInService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/controller/PdaIosInController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/controller/PdaIosInController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java
index dd0e2ec..ed362c4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/controller/PdaIosInController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.ios_manage.controller;
+package org.nl.wms.pda_manage.ios_manage.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
-import org.nl.wms.pda.ios_manage.service.PdaIosInService;
+import org.nl.wms.pda_manage.ios_manage.service.PdaIosInService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/controller/PdaIosOutController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/controller/PdaIosOutController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java
index 874c186..f6ad797 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/controller/PdaIosOutController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java
@@ -1,15 +1,12 @@
-package org.nl.wms.pda.ios_manage.controller;
+package org.nl.wms.pda_manage.ios_manage.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.nl.common.base.TableDataInfo;
-import org.nl.common.exception.BadRequestException;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.pda.ios_manage.service.PdaIosOutService;
+import org.nl.wms.pda_manage.ios_manage.service.PdaIosOutService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/PdaIosCheckService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosCheckService.java
similarity index 87%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/PdaIosCheckService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosCheckService.java
index db484e1..d0df0dd 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/PdaIosCheckService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosCheckService.java
@@ -1,9 +1,9 @@
-package org.nl.wms.pda.ios_manage.service;
+package org.nl.wms.pda_manage.ios_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.pda.util.PdaResponse;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckdtl;
+import org.nl.wms.pda_manage.util.PdaResponse;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/PdaIosInService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/PdaIosInService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java
index ae06705..1ce8ba8 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/PdaIosInService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java
@@ -1,11 +1,10 @@
-package org.nl.wms.pda.ios_manage.service;
+package org.nl.wms.pda_manage.ios_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.vo.SelectItemVo;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
-import org.nl.wms.pda.util.PdaResponse;
-import org.springframework.http.ResponseEntity;
+import org.nl.wms.pda_manage.util.PdaResponse;
 
 import java.util.List;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/PdaIosOutService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosOutService.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/PdaIosOutService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosOutService.java
index 1d51f0e..c7b8f20 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/PdaIosOutService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosOutService.java
@@ -1,7 +1,7 @@
-package org.nl.wms.pda.ios_manage.service;
+package org.nl.wms.pda_manage.ios_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.pda_manage.util.PdaResponse;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/dto/InventoryDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/dto/InventoryDto.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/dto/InventoryDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/dto/InventoryDto.java
index 95810d4..f922c69 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/dto/InventoryDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/dto/InventoryDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.ios_manage.service.dto;
+package org.nl.wms.pda_manage.ios_manage.service.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosCheckServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosCheckServiceImpl.java
similarity index 83%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosCheckServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosCheckServiceImpl.java
index 1adad9c..0f027c7 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosCheckServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosCheckServiceImpl.java
@@ -1,15 +1,15 @@
-package org.nl.wms.pda.ios_manage.service.impl;
+package org.nl.wms.pda_manage.ios_manage.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.pda.ios_manage.service.PdaIosCheckService;
-import org.nl.wms.pda.util.PdaResponse;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IStIvtCheckdtlService;
-import org.nl.wms.warehouse_management.service.IStIvtCheckmstService;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckdtl;
-import org.nl.wms.warehouse_management.service.dao.mapper.StIvtCheckdtlMapper;
+import org.nl.wms.pda_manage.ios_manage.service.PdaIosCheckService;
+import org.nl.wms.pda_manage.util.PdaResponse;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IStIvtCheckdtlService;
+import org.nl.wms.warehouse_manage.service.IStIvtCheckmstService;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl;
+import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtCheckdtlMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
index 5ff5fc6..d6eb707 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.ios_manage.service.impl;
+package org.nl.wms.pda_manage.ios_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -20,8 +20,8 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.basedata_manage.service.*;
 import org.nl.wms.basedata_manage.service.dao.*;
 import org.nl.wms.basedata_manage.service.dto.MaterialQuery;
-import org.nl.wms.pda.ios_manage.service.PdaIosInService;
-import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.pda_manage.ios_manage.service.PdaIosInService;
+import org.nl.wms.pda_manage.util.PdaResponse;
 import org.nl.wms.sch_manage.enums.StatusEnum;
 import org.nl.wms.sch_manage.enums.TaskEnum;
 import org.nl.wms.sch_manage.service.ISchBasePointService;
@@ -30,15 +30,15 @@ import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.sch_manage.service.dao.SchBaseRegion;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.tasks.BackInTask;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
-import org.nl.wms.warehouse_management.service.IRawAssistIStorService;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDtl;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDtlMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_manage.service.IRawAssistIStorService;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDtl;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDtlMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDisDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,7 +47,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
 
-import static org.nl.wms.warehouse_management.enums.IOSEnum.GROUP_PLATE_STATUS;
+import static org.nl.wms.warehouse_manage.enums.IOSEnum.GROUP_PLATE_STATUS;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosOutServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosOutServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
index 5b205ab..98d955a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosOutServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.ios_manage.service.impl;
+package org.nl.wms.pda_manage.ios_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -24,8 +24,8 @@ import org.nl.wms.basedata_manage.service.dao.*;
 import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper;
 import org.nl.wms.basedata_manage.service.dto.StrategyStructMaterialVO;
 import org.nl.wms.basedata_manage.service.dto.StrategyStructParam;
-import org.nl.wms.pda.ios_manage.service.PdaIosOutService;
-import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.pda_manage.ios_manage.service.PdaIosOutService;
+import org.nl.wms.pda_manage.util.PdaResponse;
 import org.nl.wms.sch_manage.enums.StatusEnum;
 import org.nl.wms.sch_manage.enums.TaskEnum;
 import org.nl.wms.sch_manage.service.ISchBasePointService;
@@ -34,18 +34,18 @@ import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.tasks.PdaPointTask;
 import org.nl.wms.sch_manage.service.util.tasks.StOutTask;
 import org.nl.wms.sch_manage.service.util.tasks.VehicleOutTask;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IRawAssistIStorService;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
-import org.nl.wms.warehouse_management.service.dao.IOStorInv;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDtl;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDtlMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper;
-import org.nl.wms.warehouse_management.service.util.UpdateIvtUtils;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IRawAssistIStorService;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInv;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDtl;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDisMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDtlMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper;
+import org.nl.wms.warehouse_manage.service.util.UpdateIvtUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +57,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.nl.wms.warehouse_management.enums.IOSEnum.GROUP_PLATE_STATUS;
+import static org.nl.wms.warehouse_manage.enums.IOSEnum.GROUP_PLATE_STATUS;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/controller/PdaSchPointController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchPointController.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/controller/PdaSchPointController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchPointController.java
index b8b3e0b..f850ea3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/controller/PdaSchPointController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchPointController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.sch_manage.controller;
+package org.nl.wms.pda_manage.sch_manage.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.pda.sch_manage.service.PdaSchPointService;
+import org.nl.wms.pda_manage.sch_manage.service.PdaSchPointService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/controller/PdaSchTaskController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchTaskController.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/controller/PdaSchTaskController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchTaskController.java
index d4606e2..f2cf26b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/controller/PdaSchTaskController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchTaskController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.sch_manage.controller;
+package org.nl.wms.pda_manage.sch_manage.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.pda.sch_manage.service.PdaSchTaskService;
+import org.nl.wms.pda_manage.sch_manage.service.PdaSchTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/PdaSchPointService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchPointService.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/PdaSchPointService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchPointService.java
index 86b527b..0673a6a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/PdaSchPointService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchPointService.java
@@ -1,8 +1,8 @@
-package org.nl.wms.pda.sch_manage.service;
+package org.nl.wms.pda_manage.sch_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.pda_manage.util.PdaResponse;
 import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/PdaSchTaskService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchTaskService.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/PdaSchTaskService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchTaskService.java
index 3cc764e..909ead4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/PdaSchTaskService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchTaskService.java
@@ -1,8 +1,8 @@
-package org.nl.wms.pda.sch_manage.service;
+package org.nl.wms.pda_manage.sch_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.pda_manage.util.PdaResponse;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/impl/PdaSchPointServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/impl/PdaSchPointServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java
index 795154a..abd0337 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/impl/PdaSchPointServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java
@@ -1,11 +1,11 @@
-package org.nl.wms.pda.sch_manage.service.impl;
+package org.nl.wms.pda_manage.sch_manage.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService;
-import org.nl.wms.pda.sch_manage.service.PdaSchPointService;
-import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.pda_manage.sch_manage.service.PdaSchPointService;
+import org.nl.wms.pda_manage.util.PdaResponse;
 import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.sch_manage.service.dao.mapper.SchBasePointMapper;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/impl/PdaSchTaskServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchTaskServiceImpl.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/impl/PdaSchTaskServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchTaskServiceImpl.java
index 08d75ce..9703974 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/sch_manage/service/impl/PdaSchTaskServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchTaskServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.sch_manage.service.impl;
+package org.nl.wms.pda_manage.sch_manage.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;
@@ -9,9 +9,9 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService;
 import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
-import org.nl.wms.ext.service.util.AcsResponse;
-import org.nl.wms.pda.sch_manage.service.PdaSchTaskService;
-import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.ext_manage.service.util.AcsResponse;
+import org.nl.wms.pda_manage.sch_manage.service.PdaSchTaskService;
+import org.nl.wms.pda_manage.util.PdaResponse;
 import org.nl.wms.sch_manage.enums.TaskEnum;
 import org.nl.wms.sch_manage.service.ISchBasePointService;
 import org.nl.wms.sch_manage.service.dao.SchBasePoint;
@@ -20,8 +20,8 @@ import org.nl.wms.sch_manage.service.dao.mapper.SchBaseTaskMapper;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.TaskFactory;
 import org.nl.wms.sch_manage.service.util.tasks.PdaPointTask;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PdaResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/util/PdaResponse.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PdaResponse.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/util/PdaResponse.java
index 56f3f38..4eb7871 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PdaResponse.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/util/PdaResponse.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.util;
+package org.nl.wms.pda_manage.util;
 
 import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/controller/PmFormDataController.java
similarity index 79%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/controller/PmFormDataController.java
index 5cd7d85..85a0b22 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/controller/PmFormDataController.java
@@ -1,33 +1,25 @@
-package org.nl.wms.pm_manage.form_data.controller;
+package org.nl.wms.pm_manage.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.parser.Feature;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.common.exception.BadRequestException;
 import org.nl.common.logging.annotation.Log;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
-import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
-import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
-import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
-import org.nl.wms.pm_manage.form_data.service.dao.dto.PmFormDataParam;
-import org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper;
-import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
+import org.nl.wms.pm_manage.service.IPmFormDataService;
+import org.nl.wms.pm_manage.service.dao.PmFormData;
+import org.nl.wms.pm_manage.service.dto.PmFormDataParam;
+import org.nl.wms.pm_manage.service.dto.FormDataQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
 /**
@@ -45,8 +37,7 @@ public class PmFormDataController {
 
     @Autowired
     private IPmFormDataService iPmFormDataService;
-    @Autowired
-    private PmFormDataMapper pFormDataMapper;
+
 
 
     @GetMapping()
@@ -83,7 +74,7 @@ public class PmFormDataController {
     @Log("删除单据")
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
         if (ids.length > 0) {
-            pFormDataMapper.delete(new LambdaUpdateWrapper<PmFormData>().in(PmFormData::getId, ids));
+            iPmFormDataService.removeByIds(Arrays.asList(ids));
         }
         return new ResponseEntity<>(HttpStatus.OK);
     }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataDto.java
deleted file mode 100644
index 0b2a5f5..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataDto.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.nl.wms.pm_manage.form_data.service.dao.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-
-/**
- * {@code @Description:} 表单信息表(PmFormData)数据传输类
- * {@code @Author:} gbx
- *
- * @since 2025-06-27
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class PmFormDataDto implements Serializable {
-
-    private static final long serialVersionUID = -7739291296662381396L;
-
-
-    /**
-     * 主键
-     */
-    private String id;
-    /**
-     * 编号
-     */
-    private String code;
-    /**
-     * 单据状态
-     */
-    private String status;
-    /**
-     * 单据类型
-     */
-    private String form_type;
-    /**
-     * 源单单据日期
-     */
-    private String source_form_date;
-    /**
-     * 物料code
-     */
-    private String material_code;
-    /**
-     * 批次号
-     */
-    private String pcsn;
-    /**
-     * 计划数量
-     */
-    private BigDecimal plan_qty;
-    /**
-     * 数量
-     */
-    private BigDecimal qty;
-    /**
-     * 分配数量
-     */
-    private BigDecimal assign_qty;
-    /**
-     * 实际数量
-     */
-    private BigDecimal actual_qty;
-    /**
-     * 单据累计数量
-     */
-    private BigDecimal total_qty;
-    /**
-     * 数量单位
-     */
-    private String unit_id;
-    /**
-     * 单位名称
-     */
-    private String unit_name;
-    /**
-     * 载具信息
-     */
-    private String vehicle_code;
-    /**
-     * 载具组盘id
-     */
-    private String vehicle_id;
-    /**
-     * 自定义表单字段
-     */
-    private String form_data;
-    /**
-     * 创建id
-     */
-    private String create_time;
-    /**
-     * 创建id
-     */
-    private String create_name;
-    /**
-     * 修改时间
-     */
-    private String update_time;
-    /**
-     * 修改人
-     */
-    private String update_name;
-    /**
-     * 说明
-     */
-    private String remark;
-    /**
-     * 是否完结
-     */
-    private Integer is_finish;
-
-}
-
-
-
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/IPmFormDataService.java
similarity index 75%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/IPmFormDataService.java
index 5b87193..7f84394 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/IPmFormDataService.java
@@ -1,12 +1,14 @@
-package org.nl.wms.pm_manage.form_data.service;
+package org.nl.wms.pm_manage.service;
+
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
-import org.nl.wms.pm_manage.form_data.service.dao.dto.PmFormDataParam;
-import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
-import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
+import org.nl.wms.pm_manage.service.dao.PmFormData;
+import org.nl.wms.pm_manage.service.dto.PmFormDataDto;
+import org.nl.wms.pm_manage.service.dto.PmFormDataParam;
+import org.nl.wms.pm_manage.service.dto.FormDataQuery;
+
 
 import java.util.List;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dao/PmFormData.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java
similarity index 81%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dao/PmFormData.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java
index ce008f9..d4e551a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dao/PmFormData.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java
@@ -1,11 +1,9 @@
-package org.nl.wms.pm_manage.form_data.service.dao.dao;
+package org.nl.wms.pm_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.nl.common.domain.handler.IsoToLocalDateTimeStringDeserializer;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -76,12 +74,6 @@ public class PmFormData extends Model<PmFormData> {
     private String pcsn;
 
 
-    /**
-     * 计划数量
-     */
-    private BigDecimal plan_qty;
-
-
     /**
      * 数量
      */
@@ -94,18 +86,6 @@ public class PmFormData extends Model<PmFormData> {
     private BigDecimal assign_qty;
 
 
-    /**
-     * 实际数量
-     */
-    private BigDecimal actual_qty;
-
-
-    /**
-     * 单据累计数量
-     */
-    private BigDecimal total_qty;
-
-
     /**
      * 数量单位
      */
@@ -139,7 +119,6 @@ public class PmFormData extends Model<PmFormData> {
     /**
      * 创建id
      */
-    @TableField(fill = FieldFill.INSERT)
     private String create_time;
 
 
@@ -152,7 +131,6 @@ public class PmFormData extends Model<PmFormData> {
     /**
      * 修改时间
      */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String update_time;
 
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/PmFormDataMapper.java
similarity index 75%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/PmFormDataMapper.java
index 051241f..8150051 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/PmFormDataMapper.java
@@ -1,11 +1,11 @@
-package org.nl.wms.pm_manage.form_data.service.dao.mapper;
+package org.nl.wms.pm_manage.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
-import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
-import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
-import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
+import org.nl.wms.pm_manage.service.dao.PmFormData;
+import org.nl.wms.pm_manage.service.dto.FormDataQuery;
+import org.nl.wms.pm_manage.service.dto.PmFormDataDto;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml
index 762092b..c7314a1 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper">
+<mapper namespace="org.nl.wms.pm_manage.service.dao.mapper.PmFormDataMapper">
 
-    <resultMap id="BaseResultMap" type="org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData">
+    <resultMap id="BaseResultMap" type="org.nl.wms.pm_manage.service.dao.PmFormData">
         <result property="id" column="id"/>
         <result property="code" column="code"/>
         <result property="status" column="status"/>
@@ -29,7 +29,7 @@
         <result property="remark" column="remark"/>
         <result property="is_finish" column="is_finish"/>
     </resultMap>
-    <resultMap id="dataDetail" type="org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto" >
+    <resultMap id="dataDetail" type="org.nl.wms.pm_manage.service.dto.PmFormDataDto" >
         <result  property="id" column="id"/>
         <result  property="code" column="code"/>
         <result  property="proc_inst_id" column="proc_inst_id"/>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/FormDataQuery.java
similarity index 87%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/FormDataQuery.java
index 1e7f931..4ddf818 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/FormDataQuery.java
@@ -1,10 +1,10 @@
-package org.nl.wms.pm_manage.form_data.service.dto;
+package org.nl.wms.pm_manage.service.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
+import org.nl.wms.pm_manage.service.dao.PmFormData;
 
 import java.util.Map;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataDto.java
similarity index 98%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataDto.java
index e46a90f..9f65800 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pm_manage.form_data.service.dto;
+package org.nl.wms.pm_manage.service.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataParam.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataParam.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataParam.java
index 3e38820..60070b1 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataParam.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataParam.java
@@ -1,11 +1,11 @@
-package org.nl.wms.pm_manage.form_data.service.dao.dto;
+package org.nl.wms.pm_manage.service.dto;
 
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.*;
 import org.nl.common.domain.handler.IsoToLocalDateTimeStringDeserializer;
 import org.nl.common.domain.query.BaseQuery;
-import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
+import org.nl.wms.pm_manage.service.dao.PmFormData;
 
 import java.math.BigDecimal;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/impl/PmFormDataServiceImpl.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/impl/PmFormDataServiceImpl.java
index 4a418b8..f0111ee 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/impl/PmFormDataServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pm_manage.form_data.service.impl;
+package org.nl.wms.pm_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -20,15 +20,15 @@ import org.nl.wms.basedata_manage.service.IBsrealStorattrService;
 import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
 import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
 import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
-import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
-import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
-import org.nl.wms.pm_manage.form_data.service.dao.dto.PmFormDataParam;
-import org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper;
-import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
-import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
+import org.nl.wms.pm_manage.service.dao.PmFormData;
+import org.nl.wms.pm_manage.service.dao.mapper.PmFormDataMapper;
+import org.nl.wms.pm_manage.service.dto.FormDataQuery;
+import org.nl.wms.pm_manage.service.dto.PmFormDataDto;
+import org.nl.wms.pm_manage.service.dto.PmFormDataParam;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
+import org.nl.wms.pm_manage.service.IPmFormDataService;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java
index 6352897..739578c 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java
@@ -9,12 +9,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.ext.service.WmsToAcsService;
-import org.nl.wms.ext.service.util.AcsResponse;
+import org.nl.wms.ext_manage.service.WmsToAcsService;
+import org.nl.wms.ext_manage.service.util.AcsResponse;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AutoTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AutoTask.java
index 478ba28..0354f30 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AutoTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AutoTask.java
@@ -9,13 +9,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java
index c64a5d0..f10836d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.IdUtil;
+import org.nl.common.utils.IdUtil;;
 import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.sch_manage.enums.TaskStatus;
@@ -18,7 +18,7 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 import org.nl.wms.sch_manage.service.util.TaskType;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -141,7 +141,7 @@ public class BackInTask extends AbstractTask {
                 new UpdateWrapper<Structattr>().lambda()
                     .eq(Structattr::getStruct_code, taskObj.getPoint_code2())
                     .set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code())
-                    .set(Structattr::getTaskdtl_id, null)
+                    .set(Structattr::getTask_code, null)
                     .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
         );
         // 更新起点
@@ -163,7 +163,7 @@ public class BackInTask extends AbstractTask {
         iStructattrService.update(
                 new UpdateWrapper<Structattr>().lambda()
                         .eq(Structattr::getStruct_code, taskObj.getPoint_code2())
-                        .set(Structattr::getTaskdtl_id, null)
+                        .set(Structattr::getTask_code, null)
                         .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
         );
         // 更新任务
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java
index b6eb4cd..6938262 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java
@@ -6,17 +6,17 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
+import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.IdUtil;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 import org.nl.wms.sch_manage.service.util.TaskType;
-import org.nl.wms.warehouse_management.service.IStIvtMoveinvService;
-import org.nl.wms.warehouse_management.service.IStIvtMoveinvdtlService;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoveinvdtl;
+import org.nl.wms.warehouse_manage.service.IStIvtMoveinvService;
+import org.nl.wms.warehouse_manage.service.IStIvtMoveinvdtlService;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinvdtl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java
index 02889e6..439da9b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.IdUtil;
+import org.nl.common.utils.IdUtil;;
 import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.sch_manage.enums.TaskStatus;
@@ -18,7 +18,7 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 import org.nl.wms.sch_manage.service.util.TaskType;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -148,7 +148,7 @@ public class PdaPointTask extends AbstractTask {
                 new UpdateWrapper<Structattr>().lambda()
                         .eq(Structattr::getStruct_code, taskObj.getPoint_code1())
                         .set(Structattr::getStoragevehicle_code, null)
-                        .set(Structattr::getTaskdtl_id, null)
+                        .set(Structattr::getTask_code, null)
                         .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
         );
         // 更新终点
@@ -163,7 +163,7 @@ public class PdaPointTask extends AbstractTask {
                 new UpdateWrapper<Structattr>().lambda()
                         .eq(Structattr::getStruct_code, taskObj.getPoint_code2())
                         .set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code())
-                        .set(Structattr::getTaskdtl_id, null)
+                        .set(Structattr::getTask_code, null)
                         .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
         );
         // 更新任务
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java
index 536b14b..6d314b7 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java
@@ -3,11 +3,10 @@ package org.nl.wms.sch_manage.service.util.tasks;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.IdUtil;
+import org.nl.common.utils.IdUtil;;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
@@ -15,10 +14,10 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 import org.nl.wms.sch_manage.service.util.TaskType;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IRawAssistIStorService;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IRawAssistIStorService;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDisMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
index a868c79..5f4117b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.IdUtil;
+import org.nl.common.utils.IdUtil;;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
@@ -14,10 +14,10 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 import org.nl.wms.sch_manage.service.util.TaskType;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IOutBillService;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IOutBillService;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDisMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java
index 3d464c9..fe3d4a5 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.IdUtil;
+import org.nl.common.utils.IdUtil;;
 import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.sch_manage.enums.TaskStatus;
@@ -18,7 +18,7 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 import org.nl.wms.sch_manage.service.util.TaskType;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -141,7 +141,7 @@ public class VehicleInTask extends AbstractTask {
                 new UpdateWrapper<Structattr>().lambda()
                     .eq(Structattr::getStruct_code, taskObj.getPoint_code2())
                     .set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code())
-                    .set(Structattr::getTaskdtl_id, null)
+                    .set(Structattr::getTask_code, null)
                     .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
         );
         // 更新起点
@@ -163,7 +163,7 @@ public class VehicleInTask extends AbstractTask {
         iStructattrService.update(
                 new UpdateWrapper<Structattr>().lambda()
                         .eq(Structattr::getStruct_code, taskObj.getPoint_code2())
-                        .set(Structattr::getTaskdtl_id, null)
+                        .set(Structattr::getTask_code, null)
                         .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
         );
         // 更新任务
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java
index 3be294f..7456f64 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java
@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.IdUtil;
+import org.nl.common.utils.IdUtil;;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
@@ -14,10 +14,10 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.AbstractTask;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 import org.nl.wms.sch_manage.service.util.TaskType;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IOutBillService;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IOutBillService;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDisMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java
index adecd94..73e3e03 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.coderule;
+package org.nl.wms.system_manage.controller.coderule;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -7,8 +7,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.coderule.ISysCodeRuleService;
-import org.nl.system.service.coderule.dao.SysCodeRule;
+import org.nl.wms.system_manage.service.coderule.ISysCodeRuleService;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java
similarity index 86%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java
index 632d195..7102593 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.coderule;
+package org.nl.wms.system_manage.controller.coderule;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -7,9 +7,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.coderule.ISysCodeRuleDetailService;
-import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
-import org.nl.system.service.coderule.dto.CodeRuleDetailQuery;
+import org.nl.wms.system_manage.service.coderule.ISysCodeRuleDetailService;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRuleDetail;
+import org.nl.wms.system_manage.service.coderule.dto.CodeRuleDetailQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java
index 38597b2..447d5b5 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.system.controller.dept;
+package org.nl.wms.system_manage.controller.dept;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
@@ -26,9 +26,9 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.PageUtil;
 import org.nl.common.logging.annotation.Log;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.dept.ISysDeptService;
-import org.nl.system.service.dept.dao.SysDept;
-import org.nl.system.service.dept.dto.DeptQuery;
+import org.nl.wms.system_manage.service.dept.ISysDeptService;
+import org.nl.wms.system_manage.service.dept.dao.SysDept;
+import org.nl.wms.system_manage.service.dept.dto.DeptQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
index 4543171..67f647b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.dict;
+package org.nl.wms.system_manage.controller.dict;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
@@ -7,9 +7,9 @@ import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.dict.ISysDictService;
-import org.nl.system.service.dict.dao.Dict;
-import org.nl.system.service.dict.dto.DictQuery;
+import org.nl.wms.system_manage.service.dict.ISysDictService;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.dict.dto.DictQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/logging/SysLogController.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/logging/SysLogController.java
index f9d98b8..0425638 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/logging/SysLogController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.logging;
+package org.nl.wms.system_manage.controller.logging;
 
 
 
@@ -7,7 +7,7 @@ import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.system.service.logging.ISysLogService;
+import org.nl.wms.system_manage.service.logging.ISysLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/logicflow/StageController.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/logicflow/StageController.java
index 11f386a..42238e0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/logicflow/StageController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.logicflow;
+package org.nl.wms.system_manage.controller.logicflow;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
@@ -7,8 +7,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.logicflow.IStageService;
-import org.nl.system.service.logicflow.dao.Stage;
+import org.nl.wms.system_manage.service.logicflow.IStageService;
+import org.nl.wms.system_manage.service.logicflow.dao.Stage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/logicflow/StageImageController.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/logicflow/StageImageController.java
index d0b092b..7b5a26f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/logicflow/StageImageController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.logicflow;
+package org.nl.wms.system_manage.controller.logicflow;
 
 
 
@@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.logicflow.IStageImageService;
-import org.nl.system.service.logicflow.dao.StageImage;
+import org.nl.wms.system_manage.service.logicflow.IStageImageService;
+import org.nl.wms.system_manage.service.logicflow.dao.StageImage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneLogController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/lucence/LuceneLogController.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneLogController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/lucence/LuceneLogController.java
index 4a5972a..54cc93b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneLogController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/lucence/LuceneLogController.java
@@ -1,10 +1,10 @@
-package org.nl.system.controller.lucence;
+package org.nl.wms.system_manage.controller.lucence;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.logserver.LogQuery;
-import org.nl.system.service.logserver.LuceneLogService;
+import org.nl.wms.system_manage.service.logserver.LogQuery;
+import org.nl.wms.system_manage.service.logserver.LuceneLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
index f10b1ad..2f47fa2 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.menu;
+package org.nl.wms.system_manage.controller.menu;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -10,10 +10,10 @@ import com.alibaba.fastjson.JSONObject;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.menu.ISysMenuService;
-import org.nl.system.service.menu.dao.SysMenu;
-import org.nl.system.service.menu.dto.MenuDto;
-import org.nl.system.service.menu.dto.MenuQuery;
+import org.nl.wms.system_manage.service.menu.ISysMenuService;
+import org.nl.wms.system_manage.service.menu.dao.SysMenu;
+import org.nl.wms.system_manage.service.menu.dto.MenuDto;
+import org.nl.wms.system_manage.service.menu.dto.MenuQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/notice/SysNoticeController.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/notice/SysNoticeController.java
index 2b77318..3190760 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/notice/SysNoticeController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.notice;
+package org.nl.wms.system_manage.controller.notice;
 
 import com.alibaba.fastjson.JSONObject;
 
@@ -7,8 +7,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.system.service.notice.dao.SysNotice;
+import org.nl.wms.system_manage.service.notice.ISysNoticeService;
+import org.nl.wms.system_manage.service.notice.dao.SysNotice;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java
index 56fdb61..51cd589 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.param;
+package org.nl.wms.system_manage.controller.param;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 
@@ -7,8 +7,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.param.ISysParamService;
-import org.nl.system.service.param.dao.Param;
+import org.nl.wms.system_manage.service.param.ISysParamService;
+import org.nl.wms.system_manage.service.param.dao.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java
index 4df7721..3f3738c 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.permission;
+package org.nl.wms.system_manage.controller.permission;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,9 +8,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.permission.ISysDataPermissionService;
-import org.nl.system.service.permission.dao.SysDataPermission;
-import org.nl.system.service.permission.dto.SysDataPermissionQuery;
+import org.nl.wms.system_manage.service.permission.ISysDataPermissionService;
+import org.nl.wms.system_manage.service.permission.dao.SysDataPermission;
+import org.nl.wms.system_manage.service.permission.dto.SysDataPermissionQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java
index 451a627..7f06787 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.quartz;
+package org.nl.wms.system_manage.controller.quartz;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -9,9 +9,9 @@ import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.quartz.ISysQuartzJobService;
-import org.nl.system.service.quartz.dao.SysQuartzJob;
-import org.nl.system.service.quartz.dto.JobQuery;
+import org.nl.wms.system_manage.service.quartz.ISysQuartzJobService;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzJob;
+import org.nl.wms.system_manage.service.quartz.dto.JobQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/redis/RedisController.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/redis/RedisController.java
index 52ace01..f46789e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/redis/RedisController.java
@@ -1,11 +1,11 @@
-package org.nl.system.controller.redis;
+package org.nl.wms.system_manage.controller.redis;
 
 
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.redis.RedisService;
+import org.nl.wms.system_manage.service.redis.RedisService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java
index 82ad833..96725d5 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.role;
+package org.nl.wms.system_manage.controller.role;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.fastjson.JSONObject;
@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.system.service.role.ISysRoleService;
+import org.nl.wms.system_manage.service.role.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -30,14 +30,14 @@ public class SysRoleController {
     @Autowired
     private ISysRoleService roleService;
 
-    
+
     @GetMapping
     @SaCheckPermission("roles:list")
     public ResponseEntity<Object> pageQuery(@RequestParam Map param, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(roleService.query(param, page)), HttpStatus.OK);
     }
 
-    
+
     @GetMapping("/all")
     public ResponseEntity<Object> queryAll() {
         return new ResponseEntity<>(roleService.list(), HttpStatus.OK);
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java
index 1cfef9e..c302f85 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java
@@ -1,5 +1,5 @@
 
-package org.nl.system.controller.secutiry;
+package org.nl.wms.system_manage.controller.secutiry;
 
 
 import cn.dev33.satoken.stp.StpUtil;
@@ -14,10 +14,10 @@ import org.nl.common.logging.annotation.Log;
 import org.nl.common.utils.RedisUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.dto.CurrentUser;
-import org.nl.system.service.secutiry.entity.LoginProperties;
-import org.nl.system.service.secutiry.enums.LoginCodeEnum;
-import org.nl.system.service.user.ISysUserService;
-import org.nl.system.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.secutiry.entity.LoginProperties;
+import org.nl.wms.system_manage.service.secutiry.enums.LoginCodeEnum;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/secutiry/MobileAuthorizationController.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/secutiry/MobileAuthorizationController.java
index a438b1f..3f08722 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/secutiry/MobileAuthorizationController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.secutiry;
+package org.nl.wms.system_manage.controller.secutiry;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.secure.SaSecureUtil;
@@ -14,12 +14,12 @@ import org.nl.common.base.TableDataInfo;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.RsaUtils;
 import org.nl.common.utils.dto.CurrentUser;
-import org.nl.config.RsaProperties;
+import org.nl.common.domain.constant.RsaProperties;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.role.ISysRoleService;
-import org.nl.system.service.secutiry.dto.AuthUserDto;
-import org.nl.system.service.user.ISysUserService;
-import org.nl.system.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.role.ISysRoleService;
+import org.nl.wms.system_manage.service.secutiry.dto.AuthUserDto;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/tools/ToolLocalStorageController.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/tools/ToolLocalStorageController.java
index a774089..5dcaa19 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/tools/ToolLocalStorageController.java
@@ -1,4 +1,4 @@
-package org.nl.system.controller.tools;
+package org.nl.wms.system_manage.controller.tools;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -11,9 +11,9 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.FileUtil;
 import org.nl.common.logging.annotation.Log;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.tools.IToolLocalStorageService;
-import org.nl.system.service.tools.dao.ToolLocalStorage;
-import org.nl.system.service.tools.dto.ToolLocalStorageQuery;
+import org.nl.wms.system_manage.service.tools.IToolLocalStorageService;
+import org.nl.wms.system_manage.service.tools.dao.ToolLocalStorage;
+import org.nl.wms.system_manage.service.tools.dto.ToolLocalStorageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java
index 6fb8bef..ea21f6f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.system.controller.user;
+package org.nl.wms.system_manage.controller.user;
 
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.StpUtil;
@@ -25,16 +25,16 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 
 import lombok.RequiredArgsConstructor;
 import org.nl.common.base.TableDataInfo;
+import org.nl.common.domain.constant.RsaProperties;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.config.RsaProperties;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.RsaUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.logging.annotation.Log;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.user.ISysUserService;
-import org.nl.system.service.user.dao.SysUser;
-import org.nl.system.service.user.dto.UserQuery;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.user.dto.UserQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/enums/SysParamConstant.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/enums/SysParamConstant.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java
index 0c8f446..f1987c6 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/enums/SysParamConstant.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java
@@ -1,4 +1,4 @@
-package org.nl.system.enums;
+package org.nl.wms.system_manage.enums;
 
 /**
  * @author Liuyx
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleDetailService.java
similarity index 78%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleDetailService.java
index 53e2061..70e29cc 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleDetailService.java
@@ -1,13 +1,10 @@
-package org.nl.system.service.coderule;
+package org.nl.wms.system_manage.service.coderule;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRuleDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.system.service.coderule.dto.CodeRuleDetailQuery;
-import org.springframework.data.domain.Pageable;
-
-import java.util.Map;
+import org.nl.wms.system_manage.service.coderule.dto.CodeRuleDetailQuery;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleService.java
similarity index 85%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleService.java
index 49d63fb..afb5cc0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCodeRuleService.java
@@ -1,10 +1,9 @@
-package org.nl.system.service.coderule;
+package org.nl.wms.system_manage.service.coderule;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.coderule.dao.SysCodeRule;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.system.service.coderule.dto.CodeRuleQuery;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/SysCodeRule.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/SysCodeRule.java
index 8563b74..0d1f5f0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/SysCodeRule.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.coderule.dao;
+package org.nl.wms.system_manage.service.coderule.dao;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/SysCodeRuleDetail.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/SysCodeRuleDetail.java
index b85d88a..f83e5ea 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/SysCodeRuleDetail.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.coderule.dao;
+package org.nl.wms.system_manage.service.coderule.dao;
 
 import java.math.BigDecimal;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java
similarity index 65%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java
index a76ceae..5362e0c 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java
@@ -1,6 +1,6 @@
-package org.nl.system.service.coderule.dao.mapper;
+package org.nl.wms.system_manage.service.coderule.dao.mapper;
 
-import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRuleDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleDetailMapper.xml
similarity index 61%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleDetailMapper.xml
index d6301b1..f5387b0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleDetailMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.coderule.dao.mapper.SysCodeRuleDetailMapper">
+<mapper namespace="org.nl.wms.system_manage.service.coderule.dao.mapper.SysCodeRuleDetailMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java
index b4042f5..cce5a1f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java
@@ -1,6 +1,6 @@
-package org.nl.system.service.coderule.dao.mapper;
+package org.nl.wms.system_manage.service.coderule.dao.mapper;
 
-import org.nl.system.service.coderule.dao.SysCodeRule;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml
similarity index 63%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml
index 72ca44c..481a644 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.generator.dao.mapper.CodeGenConfigMapper">
+<mapper namespace="org.nl.wms.system_manage.service.coderule.dao.mapper.SysCodeRuleMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dto/CodeRuleDetailQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dto/CodeRuleDetailQuery.java
similarity index 78%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dto/CodeRuleDetailQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dto/CodeRuleDetailQuery.java
index 0aabcf2..dcd8e97 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dto/CodeRuleDetailQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dto/CodeRuleDetailQuery.java
@@ -1,10 +1,10 @@
-package org.nl.system.service.coderule.dto;
+package org.nl.wms.system_manage.service.coderule.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRuleDetail;
 
 /**
  * @Author: lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dto/CodeRuleQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dto/CodeRuleQuery.java
similarity index 77%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dto/CodeRuleQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dto/CodeRuleQuery.java
index 421f6f2..2c96866 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dto/CodeRuleQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/dto/CodeRuleQuery.java
@@ -1,9 +1,9 @@
-package org.nl.system.service.coderule.dto;
+package org.nl.wms.system_manage.service.coderule.dto;
 
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.system.service.coderule.dao.SysCodeRule;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule;
 
 /**
  * @Author: lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleDetailServiceImpl.java
similarity index 86%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleDetailServiceImpl.java
index 778f3f4..f5b8bf7 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleDetailServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.coderule.impl;
+package org.nl.wms.system_manage.service.coderule.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.system.service.coderule.ISysCodeRuleDetailService;
-import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
-import org.nl.system.service.coderule.dao.mapper.SysCodeRuleDetailMapper;
-import org.nl.system.service.coderule.dto.CodeRuleDetailQuery;
-import org.nl.system.service.coderule.utils.CodeRuleTypeEnum;
+import org.nl.wms.system_manage.service.coderule.ISysCodeRuleDetailService;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRuleDetail;
+import org.nl.wms.system_manage.service.coderule.dao.mapper.SysCodeRuleDetailMapper;
+import org.nl.wms.system_manage.service.coderule.dto.CodeRuleDetailQuery;
+import org.nl.wms.system_manage.service.coderule.utils.CodeRuleTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java
index 3bad5e4..beb7410 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.coderule.impl;
+package org.nl.wms.system_manage.service.coderule.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -11,17 +11,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.MapOf;
+import org.nl.common.utils.MapOf;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.coderule.ISysCodeRuleService;
-import org.nl.system.service.coderule.dao.SysCodeRule;
-import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
-import org.nl.system.service.coderule.dao.mapper.SysCodeRuleDetailMapper;
-import org.nl.system.service.coderule.dao.mapper.SysCodeRuleMapper;
-import org.nl.system.service.coderule.utils.CodeRuleTypeEnum;
+import org.nl.wms.system_manage.service.coderule.ISysCodeRuleService;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRuleDetail;
+import org.nl.wms.system_manage.service.coderule.dao.mapper.SysCodeRuleDetailMapper;
+import org.nl.wms.system_manage.service.coderule.dao.mapper.SysCodeRuleMapper;
+import org.nl.wms.system_manage.service.coderule.utils.CodeRuleTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/utils/CodeRuleTypeEnum.java
similarity index 87%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/utils/CodeRuleTypeEnum.java
index c36c6d0..244a11b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/coderule/utils/CodeRuleTypeEnum.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.coderule.utils;
+package org.nl.wms.system_manage.service.coderule.utils;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/ISysDeptService.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/ISysDeptService.java
index 2670a43..89a0232 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/ISysDeptService.java
@@ -1,11 +1,10 @@
-package org.nl.system.service.dept;
+package org.nl.wms.system_manage.service.dept;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.poi.ss.formula.functions.T;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.dept.dao.SysDept;
-import org.nl.system.service.dept.dto.DeptQuery;
+import org.nl.wms.system_manage.service.dept.dao.SysDept;
+import org.nl.wms.system_manage.service.dept.dto.DeptQuery;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysUserDeptService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/ISysUserDeptService.java
similarity index 67%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysUserDeptService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/ISysUserDeptService.java
index d36b292..29cd38f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysUserDeptService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/ISysUserDeptService.java
@@ -1,7 +1,7 @@
-package org.nl.system.service.dept;
+package org.nl.wms.system_manage.service.dept;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.system.service.dept.dao.SysUserDept;
+import org.nl.wms.system_manage.service.dept.dao.SysUserDept;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/SysDept.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/SysDept.java
index 0c9a4de..5dff164 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/SysDept.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.dept.dao;
+package org.nl.wms.system_manage.service.dept.dao;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysUserDept.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/SysUserDept.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysUserDept.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/SysUserDept.java
index 9c3762c..9541ae1 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysUserDept.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/SysUserDept.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.dept.dao;
+package org.nl.wms.system_manage.service.dept.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysDeptMapper.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysDeptMapper.java
index d6c01e1..c5d5427 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysDeptMapper.java
@@ -1,8 +1,8 @@
-package org.nl.system.service.dept.dao.mapper;
+package org.nl.wms.system_manage.service.dept.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.nl.system.service.dept.dao.SysDept;
+import org.nl.wms.system_manage.service.dept.dao.SysDept;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysDeptMapper.xml
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysDeptMapper.xml
index 8f4acca..a10f594 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysDeptMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.dept.dao.mapper.SysDeptMapper">
+<mapper namespace="org.nl.wms.system_manage.service.dept.dao.mapper.SysDeptMapper">
 
     <insert id="saveDeptRelation">
         replace into sys_user_dept values
@@ -37,7 +37,7 @@
         </foreach>
             )
     </select>
-    <select id="getUserDeptByUserId" resultType="org.nl.system.service.dept.dao.SysDept">
+    <select id="getUserDeptByUserId" resultType="org.nl.wms.system_manage.service.dept.dao.SysDept">
         SELECT
             sd.*
         FROM
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysUserDeptMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysUserDeptMapper.java
similarity index 65%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysUserDeptMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysUserDeptMapper.java
index 54a4953..6076137 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysUserDeptMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysUserDeptMapper.java
@@ -1,7 +1,7 @@
-package org.nl.system.service.dept.dao.mapper;
+package org.nl.wms.system_manage.service.dept.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.system.service.dept.dao.SysUserDept;
+import org.nl.wms.system_manage.service.dept.dao.SysUserDept;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysUserDeptMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysUserDeptMapper.xml
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysUserDeptMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysUserDeptMapper.xml
index 6abf529..6df3d12 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysUserDeptMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dao/mapper/SysUserDeptMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.dept.dao.mapper.SysUserDeptMapper">
+<mapper namespace="org.nl.wms.system_manage.service.dept.dao.mapper.SysUserDeptMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptQuery.java
similarity index 86%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptQuery.java
index dadd46e..fd1989d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptQuery.java
@@ -1,10 +1,10 @@
-package org.nl.system.service.dept.dto;
+package org.nl.wms.system_manage.service.dept.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.system.service.dept.dao.SysDept;
+import org.nl.wms.system_manage.service.dept.dao.SysDept;
 
 import java.util.List;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptTree.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptTree.java
index 8aa1df3..43e0200 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptTree.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.system.service.dept.dto;
+package org.nl.wms.system_manage.service.dept.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java
index 3687f32..c759afa 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.dept.impl;
+package org.nl.wms.system_manage.service.dept.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,13 +11,13 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.dto.CurrentUser;
 import org.nl.common.domain.vo.DeptVo;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.dept.dto.DeptTree;
+import org.nl.wms.system_manage.service.dept.dto.DeptTree;
 import org.nl.common.utils.CopyUtil;
-import org.nl.config.IdUtil;
-import org.nl.system.service.dept.ISysDeptService;
-import org.nl.system.service.dept.dao.SysDept;
-import org.nl.system.service.dept.dao.mapper.SysDeptMapper;
-import org.nl.system.service.dept.dto.DeptQuery;
+import org.nl.common.utils.IdUtil;;
+import org.nl.wms.system_manage.service.dept.ISysDeptService;
+import org.nl.wms.system_manage.service.dept.dao.SysDept;
+import org.nl.wms.system_manage.service.dept.dao.mapper.SysDeptMapper;
+import org.nl.wms.system_manage.service.dept.dto.DeptQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysUserDeptServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysUserDeptServiceImpl.java
similarity index 57%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysUserDeptServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysUserDeptServiceImpl.java
index e9a9774..fb5297d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysUserDeptServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysUserDeptServiceImpl.java
@@ -1,9 +1,9 @@
-package org.nl.system.service.dept.impl;
+package org.nl.wms.system_manage.service.dept.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.system.service.dept.ISysUserDeptService;
-import org.nl.system.service.dept.dao.SysUserDept;
-import org.nl.system.service.dept.dao.mapper.SysUserDeptMapper;
+import org.nl.wms.system_manage.service.dept.ISysUserDeptService;
+import org.nl.wms.system_manage.service.dept.dao.SysUserDept;
+import org.nl.wms.system_manage.service.dept.dao.mapper.SysUserDeptMapper;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/ISysDictService.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/ISysDictService.java
index d989b22..5f3f324 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/ISysDictService.java
@@ -1,11 +1,10 @@
-package org.nl.system.service.dict;
+package org.nl.wms.system_manage.service.dict;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.dict.dao.Dict;
-import org.nl.system.service.dict.dto.DictQuery;
-import org.springframework.data.domain.Pageable;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.dict.dto.DictQuery;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dao/Dict.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dao/Dict.java
index 2010f30..b51c9ca 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dao/Dict.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.dict.dao;
+package org.nl.wms.system_manage.service.dict.dao;
 
 import java.math.BigDecimal;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dao/mapper/SysDictMapper.java
similarity index 78%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dao/mapper/SysDictMapper.java
index ea6ed3c..cca076d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dao/mapper/SysDictMapper.java
@@ -1,7 +1,7 @@
-package org.nl.system.service.dict.dao.mapper;
+package org.nl.wms.system_manage.service.dict.dao.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import org.nl.system.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dao/mapper/SysDictMapper.xml
similarity index 78%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dao/mapper/SysDictMapper.xml
index 8200f6d..2773412 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dao/mapper/SysDictMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.dict.dao.mapper.SysDictMapper">
+<mapper namespace="org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper">
     <select id="dynamicTableEnum" resultType="java.util.Map">
         select ${label} as label,${value} as value from ${table}
     </select>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dto/DictQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dto/DictQuery.java
similarity index 71%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dto/DictQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dto/DictQuery.java
index c446f91..25c6a9d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dto/DictQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/dto/DictQuery.java
@@ -1,8 +1,8 @@
-package org.nl.system.service.dict.dto;
+package org.nl.wms.system_manage.service.dict.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
-import org.nl.system.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
 
 /**
  * @Author: lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java
index da9ba0f..b2dfe96 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.dict.impl;
+package org.nl.wms.system_manage.service.dict.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -13,10 +13,10 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.dict.ISysDictService;
-import org.nl.system.service.dict.dao.Dict;
-import org.nl.system.service.dict.dao.mapper.SysDictMapper;
-import org.nl.system.service.dict.dto.DictQuery;
+import org.nl.wms.system_manage.service.dict.ISysDictService;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper;
+import org.nl.wms.system_manage.service.dict.dto.DictQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/ISysLogService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/ISysLogService.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/ISysLogService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/ISysLogService.java
index 7300bd1..a3c88ae 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/ISysLogService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/ISysLogService.java
@@ -1,10 +1,10 @@
-package org.nl.system.service.logging;
+package org.nl.wms.system_manage.service.logging;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.logging.dao.SysLog;
+import org.nl.wms.system_manage.service.logging.dao.SysLog;
 import org.springframework.scheduling.annotation.Async;
 
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/SysLog.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dao/SysLog.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/SysLog.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dao/SysLog.java
index 369f8dc..c81ddb7 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/SysLog.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dao/SysLog.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logging.dao;
+package org.nl.wms.system_manage.service.logging.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dao/mapper/SysLogMapper.java
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dao/mapper/SysLogMapper.java
index 3205364..8b470e6 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dao/mapper/SysLogMapper.java
@@ -1,6 +1,6 @@
-package org.nl.system.service.logging.dao.mapper;
+package org.nl.wms.system_manage.service.logging.dao.mapper;
 
-import org.nl.system.service.logging.dao.SysLog;
+import org.nl.wms.system_manage.service.logging.dao.SysLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dao/mapper/SysLogMapper.xml
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dao/mapper/SysLogMapper.xml
index 38be495..da6d055 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dao/mapper/SysLogMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.logging.dao.mapper.SysLogMapper">
+<mapper namespace="org.nl.wms.system_manage.service.logging.dao.mapper.SysLogMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dto/SysLogQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dto/SysLogQuery.java
similarity index 58%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dto/SysLogQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dto/SysLogQuery.java
index 2fbf523..fee40c7 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dto/SysLogQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/dto/SysLogQuery.java
@@ -1,7 +1,7 @@
-package org.nl.system.service.logging.dto;
+package org.nl.wms.system_manage.service.logging.dto;
 
 import org.nl.common.domain.query.BaseQuery;
-import org.nl.system.service.logging.dao.SysLog;
+import org.nl.wms.system_manage.service.logging.dao.SysLog;
 
 /**
  * @Author: lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/impl/SysLogServiceImpl.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/impl/SysLogServiceImpl.java
index eac87a4..dee5a21 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/impl/SysLogServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logging.impl;
+package org.nl.wms.system_manage.service.logging.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
@@ -17,9 +17,9 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
 import org.nl.common.utils.StringUtils;
 import org.nl.common.utils.ValidationUtil;
-import org.nl.system.service.logging.ISysLogService;
-import org.nl.system.service.logging.dao.SysLog;
-import org.nl.system.service.logging.dao.mapper.SysLogMapper;
+import org.nl.wms.system_manage.service.logging.ISysLogService;
+import org.nl.wms.system_manage.service.logging.dao.SysLog;
+import org.nl.wms.system_manage.service.logging.dao.mapper.SysLogMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageImageService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/IStageImageService.java
similarity index 83%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageImageService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/IStageImageService.java
index 037907a..d29bd08 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageImageService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/IStageImageService.java
@@ -1,11 +1,9 @@
-package org.nl.system.service.logicflow;
+package org.nl.wms.system_manage.service.logicflow;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.logicflow.dao.StageImage;
+import org.nl.wms.system_manage.service.logicflow.dao.StageImage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/IStageService.java
similarity index 84%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/IStageService.java
index 3e54179..182271f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/IStageService.java
@@ -1,11 +1,9 @@
-package org.nl.system.service.logicflow;
+package org.nl.wms.system_manage.service.logicflow;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.logicflow.dao.Stage;
+import org.nl.wms.system_manage.service.logicflow.dao.Stage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/Stage.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/Stage.java
index 33f9a3e..fe3465b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/Stage.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logicflow.dao;
+package org.nl.wms.system_manage.service.logicflow.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/StageImage.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/StageImage.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/StageImage.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/StageImage.java
index a96dd0d..1a7aa59 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/StageImage.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/StageImage.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logicflow.dao;
+package org.nl.wms.system_manage.service.logicflow.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageImageMapper.java
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageImageMapper.java
index 9d6eeb8..a3c329c 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageImageMapper.java
@@ -1,6 +1,6 @@
-package org.nl.system.service.logicflow.dao.mapper;
+package org.nl.wms.system_manage.service.logicflow.dao.mapper;
 
-import org.nl.system.service.logicflow.dao.StageImage;
+import org.nl.wms.system_manage.service.logicflow.dao.StageImage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageImageMapper.xml
similarity index 63%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageImageMapper.xml
index 93e3cac..b0c29cb 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageImageMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.logicflow.dao.mapper.StageImageMapper">
+<mapper namespace="org.nl.wms.system_manage.service.logicflow.dao.mapper.StageImageMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageMapper.java
similarity index 63%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageMapper.java
index abf68d1..be8fa86 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageMapper.java
@@ -1,6 +1,6 @@
-package org.nl.system.service.logicflow.dao.mapper;
+package org.nl.wms.system_manage.service.logicflow.dao.mapper;
 
-import org.nl.system.service.logicflow.dao.Stage;
+import org.nl.wms.system_manage.service.logicflow.dao.Stage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageMapper.xml
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageMapper.xml
index 10c03e4..85b03e3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/dao/mapper/StageMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.logicflow.dao.mapper.StageMapper">
+<mapper namespace="org.nl.wms.system_manage.service.logicflow.dao.mapper.StageMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/impl/StageImageServiceImpl.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/impl/StageImageServiceImpl.java
index 9bf921d..1f4d504 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/impl/StageImageServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logicflow.impl;
+package org.nl.wms.system_manage.service.logicflow.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -10,9 +10,9 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.logicflow.IStageImageService;
-import org.nl.system.service.logicflow.dao.StageImage;
-import org.nl.system.service.logicflow.dao.mapper.StageImageMapper;
+import org.nl.wms.system_manage.service.logicflow.IStageImageService;
+import org.nl.wms.system_manage.service.logicflow.dao.StageImage;
+import org.nl.wms.system_manage.service.logicflow.dao.mapper.StageImageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/impl/StageServiceImpl.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/impl/StageServiceImpl.java
index 6f09dc6..811449e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logicflow/impl/StageServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logicflow.impl;
+package org.nl.wms.system_manage.service.logicflow.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -11,9 +11,9 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.logicflow.IStageService;
-import org.nl.system.service.logicflow.dao.Stage;
-import org.nl.system.service.logicflow.dao.mapper.StageMapper;
+import org.nl.wms.system_manage.service.logicflow.IStageService;
+import org.nl.wms.system_manage.service.logicflow.dao.Stage;
+import org.nl.wms.system_manage.service.logicflow.dao.mapper.StageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LogQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LogQuery.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LogQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LogQuery.java
index 67988c4..da094e3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LogQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LogQuery.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logserver;
+package org.nl.wms.system_manage.service.logserver;
 
 import lombok.Data;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LogRepositoryDTO.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LogRepositoryDTO.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LogRepositoryDTO.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LogRepositoryDTO.java
index 0ca1d6d..7bdc0f3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LogRepositoryDTO.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LogRepositoryDTO.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logserver;
+package org.nl.wms.system_manage.service.logserver;
 
 import lombok.Data;
 import org.springframework.data.annotation.Id;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LuceneLogService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LuceneLogService.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LuceneLogService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LuceneLogService.java
index 0197ac8..1ec06a9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LuceneLogService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LuceneLogService.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logserver;
+package org.nl.wms.system_manage.service.logserver;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LuceneLogServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LuceneLogServiceImpl.java
similarity index 99%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LuceneLogServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LuceneLogServiceImpl.java
index f6e9abc..709d4dc 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logserver/LuceneLogServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LuceneLogServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.logserver;
+package org.nl.wms.system_manage.service.logserver;
 
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/ISysMenuService.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/ISysMenuService.java
index ac81039..dc2ed3f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/ISysMenuService.java
@@ -1,11 +1,11 @@
-package org.nl.system.service.menu;
+package org.nl.wms.system_manage.service.menu;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.domain.vo.MenuVo;
-import org.nl.system.service.menu.dao.SysMenu;
-import org.nl.system.service.menu.dto.MenuDto;
-import org.nl.system.service.menu.dto.MenuQuery;
+import org.nl.wms.system_manage.service.menu.dao.SysMenu;
+import org.nl.wms.system_manage.service.menu.dto.MenuDto;
+import org.nl.wms.system_manage.service.menu.dto.MenuQuery;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dao/SysMenu.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dao/SysMenu.java
index 134831b..578c3fd 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dao/SysMenu.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.menu.dao;
+package org.nl.wms.system_manage.service.menu.dao;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.java
index e1356e1..a442e71 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.java
@@ -1,11 +1,11 @@
-package org.nl.system.service.menu.dao.mapper;
+package org.nl.wms.system_manage.service.menu.dao.mapper;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.nl.system.service.menu.dao.SysMenu;
+import org.nl.wms.system_manage.service.menu.dao.SysMenu;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.xml
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.xml
index 32ff687..6184a9d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dao/mapper/SysMenuMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.menu.dao.mapper.SysMenuMapper">
+<mapper namespace="org.nl.wms.system_manage.service.menu.dao.mapper.SysMenuMapper">
 
-    <select id="findByUser" resultType="org.nl.system.service.menu.dao.SysMenu">
+    <select id="findByUser" resultType="org.nl.wms.system_manage.service.menu.dao.SysMenu">
         SELECT
         *
         FROM
@@ -51,7 +51,7 @@
         AND permission IS NOT NULL
         AND permission != ''
     </select>
-    <select id="findSystemMenu" resultType="org.nl.system.service.menu.dao.SysMenu">
+    <select id="findSystemMenu" resultType="org.nl.wms.system_manage.service.menu.dao.SysMenu">
         SELECT
         *
         FROM
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuDto.java
similarity index 98%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuDto.java
index 34e5d17..4cab773 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuDto.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.system.service.menu.dto;
+package org.nl.wms.system_manage.service.menu.dto;
 
 import lombok.Data;
 import org.nl.common.base.BaseDTO;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuQuery.java
similarity index 84%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuQuery.java
index 3408fe0..5f43fd7 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/dto/MenuQuery.java
@@ -1,10 +1,10 @@
-package org.nl.system.service.menu.dto;
+package org.nl.wms.system_manage.service.menu.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.system.service.menu.dao.SysMenu;
+import org.nl.wms.system_manage.service.menu.dao.SysMenu;
 
 /**
  * @Author: lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java
index 501df34..d0a81ec 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.menu.impl;
+package org.nl.wms.system_manage.service.menu.impl;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -12,22 +12,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.nl.common.domain.constant.DictConstantPool;
+import org.nl.common.domain.constantt.DictConstantPool;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.domain.vo.MenuMetaVo;
 import org.nl.common.domain.vo.MenuVo;
 import org.nl.common.utils.CopyUtil;
-import org.nl.config.IdUtil;
+import org.nl.common.utils.IdUtil;;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.dict.dao.Dict;
-import org.nl.system.service.dict.dao.mapper.SysDictMapper;
-import org.nl.system.service.menu.dto.MenuDto;
-import org.nl.system.service.menu.ISysMenuService;
-import org.nl.system.service.menu.dao.SysMenu;
-import org.nl.system.service.menu.dao.mapper.SysMenuMapper;
-import org.nl.system.service.menu.dto.MenuQuery;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper;
+import org.nl.wms.system_manage.service.menu.dto.MenuDto;
+import org.nl.wms.system_manage.service.menu.ISysMenuService;
+import org.nl.wms.system_manage.service.menu.dao.SysMenu;
+import org.nl.wms.system_manage.service.menu.dao.mapper.SysMenuMapper;
+import org.nl.wms.system_manage.service.menu.dto.MenuQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/ISysNoticeService.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/ISysNoticeService.java
index 50ce767..eccd3d9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/ISysNoticeService.java
@@ -1,10 +1,10 @@
-package org.nl.system.service.notice;
+package org.nl.wms.system_manage.service.notice;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.notice.dao.SysNotice;
+import org.nl.wms.system_manage.service.notice.dao.SysNotice;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dao/SysNotice.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dao/SysNotice.java
index 5566baa..7fca7c0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dao/SysNotice.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.notice.dao;
+package org.nl.wms.system_manage.service.notice.dao;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -26,28 +26,28 @@ public class SysNotice implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "notice_id", type = IdType.NONE)
-    
+
     private String notice_id;
 
-    
+
     private String notice_title;
 
-    
+
     private String notice_content;
 
-    
+
     private String notice_type;
 
-    
+
     private String have_read;
 
-    
+
     private String read_time;
 
-    
+
     private String deal_status;
 
-    
+
     private String create_time;
 
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dao/mapper/SysNoticeMapper.java
similarity index 57%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dao/mapper/SysNoticeMapper.java
index 384f7cf..ba8465d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dao/mapper/SysNoticeMapper.java
@@ -1,7 +1,7 @@
-package org.nl.system.service.notice.dao.mapper;
+package org.nl.wms.system_manage.service.notice.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.system.service.notice.dao.SysNotice;
+import org.nl.wms.system_manage.service.notice.dao.SysNotice;
 
 /**
 * @author lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dao/mapper/SysNoticeMapper.xml
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dao/mapper/SysNoticeMapper.xml
index 15b4868..c5d4aab 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dao/mapper/SysNoticeMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.notice.dao.mapper.SysNoticeMapper">
+<mapper namespace="org.nl.wms.system_manage.service.notice.dao.mapper.SysNoticeMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dto/SysNoticeDto.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dto/SysNoticeDto.java
index cf427e1..a74b762 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dto/SysNoticeDto.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.notice.dto;
+package org.nl.wms.system_manage.service.notice.dto;
 
 import lombok.Data;
 import java.io.Serializable;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dto/SysNoticeQuery.java
similarity index 56%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dto/SysNoticeQuery.java
index 16a59bf..de0ddb6 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/dto/SysNoticeQuery.java
@@ -1,7 +1,7 @@
-package org.nl.system.service.notice.dto;
+package org.nl.wms.system_manage.service.notice.dto;
 
 import org.nl.common.domain.query.BaseQuery;
-import org.nl.system.service.notice.dao.SysNotice;
+import org.nl.wms.system_manage.service.notice.dao.SysNotice;
 
 /**
 * @author lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/impl/SysNoticeServiceImpl.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/impl/SysNoticeServiceImpl.java
index 0f58aa0..12cbcff 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/notice/impl/SysNoticeServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.notice.impl;
+package org.nl.wms.system_manage.service.notice.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.NoticeEnum;
@@ -18,13 +17,12 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.common.mnt.websocket.MsgType;
 import org.nl.common.mnt.websocket.SocketMsg;
 import org.nl.common.mnt.websocket.WebSocketServer;
-import org.nl.common.utils.SecurityUtils;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.dict.dao.Dict;
-import org.nl.system.service.dict.dao.mapper.SysDictMapper;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.system.service.notice.dao.mapper.SysNoticeMapper;
-import org.nl.system.service.notice.dao.SysNotice;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper;
+import org.nl.wms.system_manage.service.notice.ISysNoticeService;
+import org.nl.wms.system_manage.service.notice.dao.mapper.SysNoticeMapper;
+import org.nl.wms.system_manage.service.notice.dao.SysNotice;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,7 +32,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Consumer;
 
 /**
  * @author lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java
index 4acb33f..461787d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java
@@ -1,9 +1,9 @@
-package org.nl.system.service.param;
+package org.nl.wms.system_manage.service.param;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.param.dao.Param;
+import org.nl.wms.system_manage.service.param.dao.Param;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dao/Param.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dao/Param.java
index 1aee6b9..e09a536 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dao/Param.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.param.dao;
+package org.nl.wms.system_manage.service.param.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dao/mapper/SysParamMapper.java
similarity index 65%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dao/mapper/SysParamMapper.java
index d2f5c86..4c74723 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dao/mapper/SysParamMapper.java
@@ -1,6 +1,6 @@
-package org.nl.system.service.param.dao.mapper;
+package org.nl.wms.system_manage.service.param.dao.mapper;
 
-import org.nl.system.service.param.dao.Param;
+import org.nl.wms.system_manage.service.param.dao.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dao/mapper/SysParamMapper.xml
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dao/mapper/SysParamMapper.xml
index 6145c62..a6c2624 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dao/mapper/SysParamMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.param.dao.mapper.SysParamMapper">
+<mapper namespace="org.nl.wms.system_manage.service.param.dao.mapper.SysParamMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dto/ParamQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dto/ParamQuery.java
similarity index 63%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dto/ParamQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dto/ParamQuery.java
index 3ed2662..6c9de96 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dto/ParamQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/dto/ParamQuery.java
@@ -1,8 +1,8 @@
-package org.nl.system.service.param.dto;
+package org.nl.wms.system_manage.service.param.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
-import org.nl.system.service.param.dao.Param;
+import org.nl.wms.system_manage.service.param.dao.Param;
 
 /**
  * @Author: lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java
index 22b587c..dff9d92 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.param.impl;
+package org.nl.wms.system_manage.service.param.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -12,13 +12,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.MapOf;
+import org.nl.common.utils.MapOf;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.param.ISysParamService;
-import org.nl.system.service.param.dao.Param;
-import org.nl.system.service.param.dao.mapper.SysParamMapper;
+import org.nl.wms.system_manage.service.param.ISysParamService;
+import org.nl.wms.system_manage.service.param.dao.Param;
+import org.nl.wms.system_manage.service.param.dao.mapper.SysParamMapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/ISysDataPermissionService.java
similarity index 80%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/ISysDataPermissionService.java
index cbe544a..a63a5ca 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/ISysDataPermissionService.java
@@ -1,14 +1,14 @@
-package org.nl.system.service.permission;
+package org.nl.wms.system_manage.service.permission;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.dict.dao.Dict;
-import org.nl.system.service.permission.dao.SysDataPermission;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.permission.dao.SysDataPermission;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.system.service.permission.dao.SysDataScope;
-import org.nl.system.service.permission.dto.SysDataPermissionQuery;
-import org.nl.system.service.user.dto.UserDataPermissionDto;
+import org.nl.wms.system_manage.service.permission.dao.SysDataScope;
+import org.nl.wms.system_manage.service.permission.dto.SysDataPermissionQuery;
+import org.nl.wms.system_manage.service.user.dto.UserDataPermissionDto;
 
 import java.util.List;
 import java.util.Set;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataPermission.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataPermission.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java
index 1c2f4ea..58aca2e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataPermission.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.permission.dao;
+package org.nl.wms.system_manage.service.permission.dao;
 
 import java.math.BigDecimal;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataScope.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataScope.java
index 5e6a8ae..aa83a12 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataScope.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.permission.dao;
+package org.nl.wms.system_manage.service.permission.dao;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/mapper/SysDataPermissionMapper.java
similarity index 86%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/mapper/SysDataPermissionMapper.java
index aa721d1..3cd77aa 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/mapper/SysDataPermissionMapper.java
@@ -1,9 +1,9 @@
-package org.nl.system.service.permission.dao.mapper;
+package org.nl.wms.system_manage.service.permission.dao.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import org.nl.system.service.permission.dao.SysDataPermission;
+import org.nl.wms.system_manage.service.permission.dao.SysDataPermission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.system.service.permission.dao.SysDataScope;
+import org.nl.wms.system_manage.service.permission.dao.SysDataScope;
 
 import java.util.List;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/mapper/SysDataPermissionMapper.xml
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/mapper/SysDataPermissionMapper.xml
index 7311d1f..e818434 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dao/mapper/SysDataPermissionMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.permission.dao.mapper.SysDataPermissionMapper">
+<mapper namespace="org.nl.wms.system_manage.service.permission.dao.mapper.SysDataPermissionMapper">
     <insert id="insertDataScope">
         INSERT INTO sys_data_scope(self_user_id, permission_scope_type, user_id)
         VALUES (#{dataScope.self_user_id}, #{dataScope.permission_scope_type}, #{dataScope.user_id})
@@ -35,7 +35,7 @@
             </if>
         </where>
     </select>
-    <select id="getDataDetail" resultType="org.nl.system.service.permission.dao.SysDataScope">
+    <select id="getDataDetail" resultType="org.nl.wms.system_manage.service.permission.dao.SysDataScope">
         SELECT
         scop.*,
         dept.`name` as deptName,
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dto/DataScopeEnum.java
similarity index 88%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dto/DataScopeEnum.java
index 12c1521..9ed802d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dto/DataScopeEnum.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.permission.dto;
+package org.nl.wms.system_manage.service.permission.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/SysDataPermissionQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dto/SysDataPermissionQuery.java
similarity index 61%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/SysDataPermissionQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dto/SysDataPermissionQuery.java
index 3eb9aed..97588c3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/SysDataPermissionQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/dto/SysDataPermissionQuery.java
@@ -1,8 +1,8 @@
-package org.nl.system.service.permission.dto;
+package org.nl.wms.system_manage.service.permission.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
-import org.nl.system.service.permission.dao.SysDataPermission;
+import org.nl.wms.system_manage.service.permission.dao.SysDataPermission;
 
 /**
  * @Author: lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java
index ea4e3a7..0d97dc3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.permission.impl;
+package org.nl.wms.system_manage.service.permission.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -12,16 +12,16 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.dict.dao.Dict;
-import org.nl.system.service.dict.dao.mapper.SysDictMapper;
-import org.nl.system.service.permission.ISysDataPermissionService;
-import org.nl.system.service.permission.dao.SysDataPermission;
-import org.nl.system.service.permission.dao.SysDataScope;
-import org.nl.system.service.permission.dao.mapper.SysDataPermissionMapper;
-import org.nl.system.service.permission.dto.DataScopeEnum;
-import org.nl.system.service.permission.dto.SysDataPermissionQuery;
-import org.nl.system.service.user.ISysUserService;
-import org.nl.system.service.user.dto.UserDataPermissionDto;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
+import org.nl.wms.system_manage.service.dict.dao.mapper.SysDictMapper;
+import org.nl.wms.system_manage.service.permission.ISysDataPermissionService;
+import org.nl.wms.system_manage.service.permission.dao.SysDataPermission;
+import org.nl.wms.system_manage.service.permission.dao.SysDataScope;
+import org.nl.wms.system_manage.service.permission.dao.mapper.SysDataPermissionMapper;
+import org.nl.wms.system_manage.service.permission.dto.DataScopeEnum;
+import org.nl.wms.system_manage.service.permission.dto.SysDataPermissionQuery;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dto.UserDataPermissionDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/ISysQuartzJobService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/ISysQuartzJobService.java
similarity index 86%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/ISysQuartzJobService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/ISysQuartzJobService.java
index 0f71295..8b8c57d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/ISysQuartzJobService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/ISysQuartzJobService.java
@@ -1,12 +1,11 @@
-package org.nl.system.service.quartz;
+package org.nl.wms.system_manage.service.quartz;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.quartz.dao.SysQuartzJob;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzJob;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.system.service.quartz.dao.SysQuartzLog;
-import org.nl.system.service.quartz.dto.JobQuery;
-import org.springframework.data.domain.Pageable;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzLog;
+import org.nl.wms.system_manage.service.quartz.dto.JobQuery;
 
 import java.util.List;
 import java.util.Set;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/config/JobRunner.java
similarity index 79%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/config/JobRunner.java
index 8c3328d..bf616b2 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/config/JobRunner.java
@@ -1,9 +1,8 @@
-package org.nl.system.service.quartz.config;
+package org.nl.wms.system_manage.service.quartz.config;
 
 import lombok.RequiredArgsConstructor;
-import org.nl.system.service.quartz.ISysQuartzJobService;
-import org.nl.system.service.quartz.dao.SysQuartzJob;
-import org.nl.system.service.quartz.utils.QuartzManage;
+import org.nl.wms.system_manage.service.quartz.ISysQuartzJobService;
+import org.nl.wms.system_manage.service.quartz.utils.QuartzManage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.ApplicationArguments;
@@ -11,8 +10,6 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * <p>
  * 项目启动时重新激活启用的定时任务
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/config/QuartzConfig.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/config/QuartzConfig.java
index b3b88e5..cac7854 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/config/QuartzConfig.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.quartz.config;
+package org.nl.wms.system_manage.service.quartz.config;
 
 import org.quartz.Scheduler;
 import org.quartz.spi.TriggerFiredBundle;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzJob.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/SysQuartzJob.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzJob.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/SysQuartzJob.java
index 98c69df..3cd0c9f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzJob.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/SysQuartzJob.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.quartz.dao;
+package org.nl.wms.system_manage.service.quartz.dao;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzLog.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/SysQuartzLog.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzLog.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/SysQuartzLog.java
index 7e685d4..30429eb 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/SysQuartzLog.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/SysQuartzLog.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.quartz.dao;
+package org.nl.wms.system_manage.service.quartz.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzJobMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzJobMapper.java
similarity index 65%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzJobMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzJobMapper.java
index eba919d..a3629a5 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzJobMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzJobMapper.java
@@ -1,6 +1,6 @@
-package org.nl.system.service.quartz.dao.mapper;
+package org.nl.wms.system_manage.service.quartz.dao.mapper;
 
-import org.nl.system.service.quartz.dao.SysQuartzJob;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzJob;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzJobMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzJobMapper.xml
similarity index 63%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzJobMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzJobMapper.xml
index 22b1c0e..17c2321 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzJobMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzJobMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.quartz.dao.mapper.SysQuartzJobMapper">
+<mapper namespace="org.nl.wms.system_manage.service.quartz.dao.mapper.SysQuartzJobMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzLogMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzLogMapper.java
similarity index 65%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzLogMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzLogMapper.java
index db0274e..7860954 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzLogMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzLogMapper.java
@@ -1,6 +1,6 @@
-package org.nl.system.service.quartz.dao.mapper;
+package org.nl.wms.system_manage.service.quartz.dao.mapper;
 
-import org.nl.system.service.quartz.dao.SysQuartzLog;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzLogMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzLogMapper.xml
similarity index 63%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzLogMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzLogMapper.xml
index 190cdac..b4f0032 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dao/mapper/SysQuartzLogMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dao/mapper/SysQuartzLogMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.quartz.dao.mapper.SysQuartzLogMapper">
+<mapper namespace="org.nl.wms.system_manage.service.quartz.dao.mapper.SysQuartzLogMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dto/JobQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dto/JobQuery.java
similarity index 83%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dto/JobQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dto/JobQuery.java
index 4a0dc5f..ea55841 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/dto/JobQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/dto/JobQuery.java
@@ -1,10 +1,10 @@
-package org.nl.system.service.quartz.dto;
+package org.nl.wms.system_manage.service.quartz.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.system.service.quartz.dao.SysQuartzJob;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzJob;
 
 import java.sql.Timestamp;
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/impl/SysQuartzJobServiceImpl.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/impl/SysQuartzJobServiceImpl.java
index a3b4b20..965ad3d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/impl/SysQuartzJobServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.quartz.impl;
+package org.nl.wms.system_manage.service.quartz.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -13,13 +13,13 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.RedisUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.quartz.ISysQuartzJobService;
-import org.nl.system.service.quartz.dao.SysQuartzJob;
-import org.nl.system.service.quartz.dao.SysQuartzLog;
-import org.nl.system.service.quartz.dao.mapper.SysQuartzJobMapper;
-import org.nl.system.service.quartz.dao.mapper.SysQuartzLogMapper;
-import org.nl.system.service.quartz.dto.JobQuery;
-import org.nl.system.service.quartz.utils.QuartzManage;
+import org.nl.wms.system_manage.service.quartz.ISysQuartzJobService;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzJob;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzLog;
+import org.nl.wms.system_manage.service.quartz.dao.mapper.SysQuartzJobMapper;
+import org.nl.wms.system_manage.service.quartz.dao.mapper.SysQuartzLogMapper;
+import org.nl.wms.system_manage.service.quartz.dto.JobQuery;
+import org.nl.wms.system_manage.service.quartz.utils.QuartzManage;
 import org.quartz.CronExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/task/AutoClearLuceneData.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/task/AutoClearLuceneData.java
index c4c0c43..3d74383 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/task/AutoClearLuceneData.java
@@ -1,12 +1,12 @@
-package org.nl.system.service.quartz.task;
+package org.nl.wms.system_manage.service.quartz.task;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.lucene.document.LongPoint;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.search.Query;
 import org.nl.config.lucene.LuceneAppender;
-import org.nl.system.service.param.ISysParamService;
-import org.nl.system.service.param.dao.Param;
+import org.nl.wms.system_manage.service.param.ISysParamService;
+import org.nl.wms.system_manage.service.param.dao.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/TestTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/task/TestTask.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/TestTask.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/task/TestTask.java
index 9a402db..c61a395 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/TestTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/task/TestTask.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.quartz.task;
+package org.nl.wms.system_manage.service.quartz.task;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java
index c46de44..ece4f4a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java
@@ -1,15 +1,15 @@
-package org.nl.system.service.quartz.utils;
+package org.nl.wms.system_manage.service.quartz.utils;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import org.nl.common.utils.RedisUtils;
 import org.nl.config.SpringContextHolder;
-import org.nl.system.service.quartz.ISysQuartzJobService;
-import org.nl.system.service.quartz.dao.SysQuartzJob;
-import org.nl.system.service.quartz.dao.SysQuartzLog;
-import org.nl.system.service.quartz.dao.mapper.SysQuartzLogMapper;
-import org.nl.system.service.quartz.impl.SysQuartzJobServiceImpl;
+import org.nl.wms.system_manage.service.quartz.ISysQuartzJobService;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzJob;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzLog;
+import org.nl.wms.system_manage.service.quartz.dao.mapper.SysQuartzLogMapper;
+import org.nl.wms.system_manage.service.quartz.impl.SysQuartzJobServiceImpl;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzManage.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzManage.java
index ca4a3e6..4631369 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzManage.java
@@ -1,9 +1,9 @@
-package org.nl.system.service.quartz.utils;
+package org.nl.wms.system_manage.service.quartz.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.quartz.dao.SysQuartzJob;
+import org.nl.wms.system_manage.service.quartz.dao.SysQuartzJob;
 import org.quartz.*;
 import org.quartz.impl.triggers.CronTriggerImpl;
 import org.springframework.stereotype.Component;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzRunnable.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzRunnable.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzRunnable.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzRunnable.java
index 4198696..49d431e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzRunnable.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzRunnable.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.quartz.utils;
+package org.nl.wms.system_manage.service.quartz.utils;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/RedisService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/RedisService.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/RedisService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/RedisService.java
index 7370196..f8bc24e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/RedisService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/RedisService.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.redis;
+package org.nl.wms.system_manage.service.redis;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/dao/RedisKeyDefine.java
similarity index 98%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/dao/RedisKeyDefine.java
index 5312027..ba1668a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/dao/RedisKeyDefine.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.redis.dao;
+package org.nl.wms.system_manage.service.redis.dao;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.AllArgsConstructor;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/dao/RedisKeyRegistry.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/dao/RedisKeyRegistry.java
index 38618a6..dcf9c1c 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/dao/RedisKeyRegistry.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.redis.dao;
+package org.nl.wms.system_manage.service.redis.dao;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/impl/RedisServiceImpl.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/impl/RedisServiceImpl.java
index 4fb37ab..5d35a60 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/impl/RedisServiceImpl.java
@@ -1,10 +1,10 @@
-package org.nl.system.service.redis.impl;
+package org.nl.wms.system_manage.service.redis.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.system.service.redis.RedisService;
+import org.nl.wms.system_manage.service.redis.RedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.DataType;
 import org.springframework.data.redis.connection.RedisServerCommands;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/vo/RedisKeyDefineRespVO.java
similarity index 80%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/vo/RedisKeyDefineRespVO.java
index 6863b1c..309d4be 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/vo/RedisKeyDefineRespVO.java
@@ -1,11 +1,11 @@
-package org.nl.system.service.redis.vo;
+package org.nl.wms.system_manage.service.redis.vo;
 
 
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import org.nl.system.service.redis.dao.RedisKeyDefine;
+import org.nl.wms.system_manage.service.redis.dao.RedisKeyDefine;
 
 import java.time.Duration;
 
@@ -18,21 +18,21 @@ import java.time.Duration;
 @Builder
 @AllArgsConstructor
 public class RedisKeyDefineRespVO {
-    
+
     private String keyTemplate;
 
-    
+
     private RedisKeyDefine.KeyTypeEnum keyType;
 
-    
+
     private Class<?> valueType;
 
-    
+
     private RedisKeyDefine.TimeoutTypeEnum timeoutType;
 
-    
+
     private Duration timeout;
 
-    
+
     private String memo;
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/vo/RedisMonitorRespVO.java
similarity index 87%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/vo/RedisMonitorRespVO.java
index 65de98a..d0fc1f2 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/redis/vo/RedisMonitorRespVO.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.redis.vo;
+package org.nl.wms.system_manage.service.redis.vo;
 
 
 
@@ -18,13 +18,13 @@ import java.util.Properties;
 @Builder
 @AllArgsConstructor
 public class RedisMonitorRespVO {
-    
+
     private Properties info;
 
-    
+
     private Long dbSize;
 
-    
+
     private List<CommandStat> commandStats;
 
     @Data
@@ -32,13 +32,13 @@ public class RedisMonitorRespVO {
     @AllArgsConstructor
     public static class CommandStat {
 
-        
+
         private String command;
 
-        
+
         private Integer calls;
 
-        
+
         private Long usec;
 
     }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/ISysRoleService.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/ISysRoleService.java
index 9ad24b9..ce64ca6 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/ISysRoleService.java
@@ -1,10 +1,10 @@
-package org.nl.system.service.role;
+package org.nl.wms.system_manage.service.role;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.role.dao.SysRole;
+import org.nl.wms.system_manage.service.role.dao.SysRole;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/dao/SysRole.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/dao/SysRole.java
index b737fb5..b42b638 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/dao/SysRole.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.role.dao;
+package org.nl.wms.system_manage.service.role.dao;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/dao/mapper/SysRoleMapper.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/dao/mapper/SysRoleMapper.java
index dd106db..a42729a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/dao/mapper/SysRoleMapper.java
@@ -1,8 +1,8 @@
-package org.nl.system.service.role.dao.mapper;
+package org.nl.wms.system_manage.service.role.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.nl.system.service.role.dao.SysRole;
+import org.nl.wms.system_manage.service.role.dao.SysRole;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/dao/mapper/SysRoleMapper.xml
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/dao/mapper/SysRoleMapper.xml
index 3d54ea7..0f6089b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/dao/mapper/SysRoleMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.role.dao.mapper.SysRoleMapper">
+<mapper namespace="org.nl.wms.system_manage.service.role.dao.mapper.SysRoleMapper">
 
     <insert id="saveRoleRelation">
         replace into sys_users_roles values
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/impl/SysRoleServiceImpl.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/impl/SysRoleServiceImpl.java
index 3b52db0..e2c6223 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/role/impl/SysRoleServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.role.impl;
+package org.nl.wms.system_manage.service.role.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -15,10 +15,10 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.menu.dao.mapper.SysMenuMapper;
-import org.nl.system.service.role.ISysRoleService;
-import org.nl.system.service.role.dao.SysRole;
-import org.nl.system.service.role.dao.mapper.SysRoleMapper;
+import org.nl.wms.system_manage.service.menu.dao.mapper.SysMenuMapper;
+import org.nl.wms.system_manage.service.role.ISysRoleService;
+import org.nl.wms.system_manage.service.role.dao.SysRole;
+import org.nl.wms.system_manage.service.role.dao.mapper.SysRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/HandLoginService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/HandLoginService.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/HandLoginService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/HandLoginService.java
index 1c199a3..8bd101b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/HandLoginService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/HandLoginService.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.secutiry;
+package org.nl.wms.system_manage.service.secutiry;
 
 import java.util.Map;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/dto/AuthUserDto.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/dto/AuthUserDto.java
index 2eb6e21..c8b6459 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/dto/AuthUserDto.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.system.service.secutiry.dto;
+package org.nl.wms.system_manage.service.secutiry.dto;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/OnlineUserDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/dto/OnlineUserDto.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/OnlineUserDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/dto/OnlineUserDto.java
index 18eccae..99bb545 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/OnlineUserDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/dto/OnlineUserDto.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.system.service.user.dto;
+package org.nl.wms.system_manage.service.secutiry.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/entity/LoginCode.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/entity/LoginCode.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/entity/LoginCode.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/entity/LoginCode.java
index be188a0..2e80588 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/entity/LoginCode.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/entity/LoginCode.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.nl.system.service.secutiry.entity;
+package org.nl.wms.system_manage.service.secutiry.entity;
 
 import lombok.Data;
-import org.nl.system.service.secutiry.enums.LoginCodeEnum;
+import org.nl.wms.system_manage.service.secutiry.enums.LoginCodeEnum;
 
 /**
  * 登录验证码配置信息
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/entity/LoginProperties.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/entity/LoginProperties.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/entity/LoginProperties.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/entity/LoginProperties.java
index b67003a..edfcea2 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/entity/LoginProperties.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/entity/LoginProperties.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.nl.system.service.secutiry.entity;
+package org.nl.wms.system_manage.service.secutiry.entity;
 
 import cn.hutool.core.util.StrUtil;
 import com.wf.captcha.*;
 import com.wf.captcha.base.Captcha;
 import lombok.Data;
 import org.nl.common.exception.BadRequestException;
-import org.nl.system.service.secutiry.enums.LoginCodeEnum;
+import org.nl.wms.system_manage.service.secutiry.enums.LoginCodeEnum;
 import org.springframework.stereotype.Component;
 
 import java.awt.*;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/enums/LoginCodeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/enums/LoginCodeEnum.java
similarity index 79%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/enums/LoginCodeEnum.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/enums/LoginCodeEnum.java
index 893627f..d9dc319 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/enums/LoginCodeEnum.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/enums/LoginCodeEnum.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.secutiry.enums;
+package org.nl.wms.system_manage.service.secutiry.enums;
 
 public enum LoginCodeEnum {
     /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/HandLoginServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/impl/HandLoginServiceImpl.java
similarity index 90%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/HandLoginServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/impl/HandLoginServiceImpl.java
index bfe8517..820bbf4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/HandLoginServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/secutiry/impl/HandLoginServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.secutiry.impl;
+package org.nl.wms.system_manage.service.secutiry.impl;
 
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.SaLoginModel;
@@ -13,10 +13,10 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.RedisUtils;
 import org.nl.common.utils.RsaUtils;
 import org.nl.common.utils.dto.CurrentUser;
-import org.nl.system.service.role.ISysRoleService;
-import org.nl.system.service.secutiry.HandLoginService;
-import org.nl.system.service.user.ISysUserService;
-import org.nl.system.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.role.ISysRoleService;
+import org.nl.wms.system_manage.service.secutiry.HandLoginService;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/IToolLocalStorageService.java
similarity index 82%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/IToolLocalStorageService.java
index 2c428a3..69eb890 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/IToolLocalStorageService.java
@@ -1,11 +1,10 @@
-package org.nl.system.service.tools;
+package org.nl.wms.system_manage.service.tools;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.tools.dao.ToolLocalStorage;
+import org.nl.wms.system_manage.service.tools.dao.ToolLocalStorage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.system.service.tools.dto.ToolLocalStorageQuery;
-import org.springframework.data.domain.Pageable;
+import org.nl.wms.system_manage.service.tools.dto.ToolLocalStorageQuery;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Set;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dao/ToolLocalStorage.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dao/ToolLocalStorage.java
index 88a1296..dfbbb8b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dao/ToolLocalStorage.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.tools.dao;
+package org.nl.wms.system_manage.service.tools.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dao/mapper/ToolLocalStorageMapper.java
similarity index 65%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dao/mapper/ToolLocalStorageMapper.java
index 488006c..3e54144 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dao/mapper/ToolLocalStorageMapper.java
@@ -1,6 +1,6 @@
-package org.nl.system.service.tools.dao.mapper;
+package org.nl.wms.system_manage.service.tools.dao.mapper;
 
-import org.nl.system.service.tools.dao.ToolLocalStorage;
+import org.nl.wms.system_manage.service.tools.dao.ToolLocalStorage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dao/mapper/ToolLocalStorageMapper.xml
similarity index 62%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dao/mapper/ToolLocalStorageMapper.xml
index 816d130..a3b9259 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dao/mapper/ToolLocalStorageMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.tools.dao.mapper.ToolLocalStorageMapper">
+<mapper namespace="org.nl.wms.system_manage.service.tools.dao.mapper.ToolLocalStorageMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dto/ToolLocalStorageQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dto/ToolLocalStorageQuery.java
similarity index 63%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dto/ToolLocalStorageQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dto/ToolLocalStorageQuery.java
index 9fc664a..9e4cc3a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dto/ToolLocalStorageQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/dto/ToolLocalStorageQuery.java
@@ -1,8 +1,8 @@
-package org.nl.system.service.tools.dto;
+package org.nl.wms.system_manage.service.tools.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
-import org.nl.system.service.tools.dao.ToolLocalStorage;
+import org.nl.wms.system_manage.service.tools.dao.ToolLocalStorage;
 
 /**
  * @Author: lyd
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/impl/ToolLocalStorageServiceImpl.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/impl/ToolLocalStorageServiceImpl.java
index 0210b4a..ceabd0d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/tools/impl/ToolLocalStorageServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.tools.impl;
+package org.nl.wms.system_manage.service.tools.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -11,11 +11,11 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.FileUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.language.LangProcess;
-import org.nl.system.service.tools.dao.ToolLocalStorage;
-import org.nl.system.service.tools.dao.mapper.ToolLocalStorageMapper;
-import org.nl.system.service.tools.IToolLocalStorageService;
+import org.nl.wms.system_manage.service.tools.dao.ToolLocalStorage;
+import org.nl.wms.system_manage.service.tools.dao.mapper.ToolLocalStorageMapper;
+import org.nl.wms.system_manage.service.tools.IToolLocalStorageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.system.service.tools.dto.ToolLocalStorageQuery;
+import org.nl.wms.system_manage.service.tools.dto.ToolLocalStorageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/ISysUserService.java
similarity index 86%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/ISysUserService.java
index 6c1a34b..1e09e5e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/ISysUserService.java
@@ -1,12 +1,12 @@
-package org.nl.system.service.user;
+package org.nl.wms.system_manage.service.user;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.user.dao.SysUser;
-import org.nl.system.service.user.dto.SysUserDetail;
-import org.nl.system.service.user.dto.UserDataPermissionDto;
-import org.nl.system.service.user.dto.UserQuery;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.user.dto.SysUserDetail;
+import org.nl.wms.system_manage.service.user.dto.UserDataPermissionDto;
+import org.nl.wms.system_manage.service.user.dto.UserQuery;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dao/SysUser.java
similarity index 98%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dao/SysUser.java
index 616dae8..f969c45 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dao/SysUser.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.user.dao;
+package org.nl.wms.system_manage.service.user.dao;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dao/mapper/SysUserMapper.java
similarity index 84%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dao/mapper/SysUserMapper.java
index 2effc52..6f27706 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dao/mapper/SysUserMapper.java
@@ -1,13 +1,12 @@
-package org.nl.system.service.user.dao.mapper;
+package org.nl.wms.system_manage.service.user.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.system.service.user.dao.SysUser;
-import org.nl.system.service.user.dto.SysUserDetail;
-import org.nl.system.service.user.dto.UserDataPermissionDto;
-import org.nl.system.service.user.dto.UserQuery;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.user.dto.SysUserDetail;
+import org.nl.wms.system_manage.service.user.dto.UserDataPermissionDto;
+import org.nl.wms.system_manage.service.user.dto.UserQuery;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dao/mapper/SysUserMapper.xml
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dao/mapper/SysUserMapper.xml
index 719c300..6687163 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dao/mapper/SysUserMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.user.dao.mapper.SysUserMapper">
+<mapper namespace="org.nl.wms.system_manage.service.user.dao.mapper.SysUserMapper">
     <sql id="Base_Column_List">
         sys_user.user_id as userId,
         sys_user.username as username,
@@ -30,7 +30,7 @@
     <delete id="deleteDataPermissionById">
         DELETE FROM sys_user_data_permission WHERE user_id = #{userId}
     </delete>
-    <resultMap id="UserDetail" type="org.nl.system.service.user.dto.SysUserDetail" >
+    <resultMap id="UserDetail" type="org.nl.wms.system_manage.service.user.dto.SysUserDetail" >
         <id column="userId" property="user_id"  />
         <result column="username" property="username" />
         <result column="personName" property="person_name" />
@@ -52,11 +52,11 @@
         <result column="updateTime" property="update_time" />
         <result column="extpersonId" property="extperson_id" />
         <result column="extuserId" property="extuser_id" />
-        <collection property="depts" ofType="org.nl.system.service.dept.dao.SysDept">
+        <collection property="depts" ofType="org.nl.wms.system_manage.service.dept.dao.SysDept">
             <id property="dept_id" column="dept_id"/>
             <result column="dept_name" property="name"/>
         </collection>
-        <collection property="roles" ofType="org.nl.system.service.role.dao.SysRole">
+        <collection property="roles" ofType="org.nl.wms.system_manage.service.role.dao.SysRole">
             <id property="role_id" column="role_id"/>
         </collection>
     </resultMap>
@@ -122,11 +122,11 @@
         GROUP BY sys_user.user_id
     </select>
     <select id="getUserDataPermissionByPermissionId"
-            resultType="org.nl.system.service.user.dto.UserDataPermissionDto">
+            resultType="org.nl.wms.system_manage.service.user.dto.UserDataPermissionDto">
         SELECT * FROM sys_user_data_permission WHERE permission_id = #{permissionId}
     </select>
     <select id="getUserDataPermissionByUserId"
-            resultType="org.nl.system.service.user.dto.UserDataPermissionDto">
+            resultType="org.nl.wms.system_manage.service.user.dto.UserDataPermissionDto">
         SELECT * FROM sys_user_data_permission WHERE user_id = #{userId}
     </select>
     <select id="getUserIdByDeptId" resultType="java.lang.String">
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/OnlineUserDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/OnlineUserDto.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/OnlineUserDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/OnlineUserDto.java
index c1e93e0..e1e4800 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/OnlineUserDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/OnlineUserDto.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.system.service.secutiry.dto;
+package org.nl.wms.system_manage.service.user.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/SysUserDetail.java
similarity index 50%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/SysUserDetail.java
index 5ec1c0b..7620305 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/SysUserDetail.java
@@ -1,9 +1,9 @@
-package org.nl.system.service.user.dto;
+package org.nl.wms.system_manage.service.user.dto;
 
 import lombok.Data;
-import org.nl.system.service.dept.dao.SysDept;
-import org.nl.system.service.role.dao.SysRole;
-import org.nl.system.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.dept.dao.SysDept;
+import org.nl.wms.system_manage.service.role.dao.SysRole;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 
 import java.util.List;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/UserDataPermissionDto.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/UserDataPermissionDto.java
index d9fb570..7af111f 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/UserDataPermissionDto.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.user.dto;
+package org.nl.wms.system_manage.service.user.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/UserQuery.java
similarity index 80%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/UserQuery.java
index 1d5dbc0..bd56e0a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/dto/UserQuery.java
@@ -1,10 +1,10 @@
-package org.nl.system.service.user.dto;
+package org.nl.wms.system_manage.service.user.dto;
 
 import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.system.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 
 /**
  * 条件
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java
index f4952fd..754c703 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.system.service.user.impl;
+package org.nl.wms.system_manage.service.user.impl;
 
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.SaLoginModel;
@@ -19,16 +19,16 @@ import org.nl.common.utils.dto.CurrentUser;
 import org.nl.config.FileProperties;
 import org.nl.common.utils.FileUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.IdUtil;
-import org.nl.system.service.dept.ISysDeptService;
-import org.nl.system.service.role.ISysRoleService;
-import org.nl.system.service.secutiry.dto.AuthUserDto;
-import org.nl.system.service.user.ISysUserService;
-import org.nl.system.service.user.dao.SysUser;
-import org.nl.system.service.user.dao.mapper.SysUserMapper;
-import org.nl.system.service.user.dto.SysUserDetail;
-import org.nl.system.service.user.dto.UserDataPermissionDto;
-import org.nl.system.service.user.dto.UserQuery;
+import org.nl.common.utils.IdUtil;;
+import org.nl.wms.system_manage.service.dept.ISysDeptService;
+import org.nl.wms.system_manage.service.role.ISysRoleService;
+import org.nl.wms.system_manage.service.secutiry.dto.AuthUserDto;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.user.dao.mapper.SysUserMapper;
+import org.nl.wms.system_manage.service.user.dto.SysUserDetail;
+import org.nl.wms.system_manage.service.user.dto.UserDataPermissionDto;
+import org.nl.wms.system_manage.service.user.dto.UserQuery;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/CheckController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/CheckController.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/CheckController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/CheckController.java
index 1d58b2c..e882be1 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/CheckController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/CheckController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.controller;
+package org.nl.wms.warehouse_manage.controller;
 
 
 import lombok.RequiredArgsConstructor;
@@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.warehouse_management.service.IStIvtCheckmstService;
-import org.nl.wms.warehouse_management.service.dto.CheckInsertDto;
+import org.nl.wms.warehouse_manage.service.IStIvtCheckmstService;
+import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/MoreOrlessController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/MoreOrlessController.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/MoreOrlessController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/MoreOrlessController.java
index 113eec6..5b7b432 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/MoreOrlessController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/MoreOrlessController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.controller;
+package org.nl.wms.warehouse_manage.controller;
 
 
 import lombok.RequiredArgsConstructor;
@@ -6,9 +6,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.warehouse_management.service.IStIvtMoreorlessmstService;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoreorlessmst;
-import org.nl.wms.warehouse_management.service.dto.MoreOrLessInsertDto;
+import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessmstService;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessmst;
+import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/MoveStorController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/MoveStorController.java
similarity index 91%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/MoveStorController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/MoveStorController.java
index 5c0b918..ea4147d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/MoveStorController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/MoveStorController.java
@@ -1,14 +1,13 @@
-package org.nl.wms.warehouse_management.controller;
+package org.nl.wms.warehouse_manage.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.warehouse_management.service.IStIvtMoveinvService;
-import org.nl.wms.warehouse_management.service.dto.MoveInsertDto;
+import org.nl.wms.warehouse_manage.service.IStIvtMoveinvService;
+import org.nl.wms.warehouse_manage.service.dto.MoveInsertDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/OutBillController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/OutBillController.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/OutBillController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/OutBillController.java
index 0115a1b..2e03a09 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/OutBillController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/OutBillController.java
@@ -1,13 +1,11 @@
-package org.nl.wms.warehouse_management.controller;
+package org.nl.wms.warehouse_manage.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.warehouse_management.service.IOutBillService;
-import org.springframework.data.domain.Pageable;
+import org.nl.wms.warehouse_manage.service.IOutBillService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/RawAssistIStorController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/RawAssistIStorController.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/RawAssistIStorController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/RawAssistIStorController.java
index 80e8990..b833cc2 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/RawAssistIStorController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/RawAssistIStorController.java
@@ -1,14 +1,12 @@
-package org.nl.wms.warehouse_management.controller;
+package org.nl.wms.warehouse_manage.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.warehouse_management.service.IRawAssistIStorService;
-import org.springframework.data.domain.Pageable;
+import org.nl.wms.warehouse_manage.service.IRawAssistIStorService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/ReturnController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/ReturnController.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/ReturnController.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/ReturnController.java
index efedaed..2aa23c8 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/ReturnController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/ReturnController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.controller;
+package org.nl.wms.warehouse_manage.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.warehouse_management.service.ReturnService;
+import org.nl.wms.warehouse_manage.service.ReturnService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSConstant.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSConstant.java
index 2cddd91..02e606c 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSConstant.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.enums;
+package org.nl.wms.warehouse_manage.enums;
 
 /**
  * @author Liuyx
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java
similarity index 98%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java
index ea35a8e..ea52c2b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.enums;
+package org.nl.wms.warehouse_manage.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IMdPbGroupplateService.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IMdPbGroupplateService.java
index b567307..1bfc8d0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IMdPbGroupplateService.java
@@ -1,10 +1,10 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IOutBillService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IOutBillService.java
similarity index 86%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IOutBillService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IOutBillService.java
index 9b96766..cdf59a0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IOutBillService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IOutBillService.java
@@ -1,21 +1,14 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.basedata_manage.service.dto.MdPbStoragevehicleextDto;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
-import org.nl.wms.warehouse_management.service.dao.IOStorInv;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDtlDto;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInv;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDisDto;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDtlDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IRawAssistIStorService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IRawAssistIStorService.java
similarity index 80%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IRawAssistIStorService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IRawAssistIStorService.java
index 183f509..27deb03 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IRawAssistIStorService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IRawAssistIStorService.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
-import org.nl.wms.warehouse_management.service.dao.IOStorInv;
-import org.nl.wms.warehouse_management.service.dto.GroupPlateDto;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDtlDto;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInv;
+import org.nl.wms.warehouse_manage.service.dto.GroupPlateDto;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDisDto;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDtlDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtCheckdtlService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckdtlService.java
similarity index 84%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtCheckdtlService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckdtlService.java
index b6adeed..6daa6ba 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtCheckdtlService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckdtlService.java
@@ -1,9 +1,9 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckdtl;
-import org.nl.wms.warehouse_management.service.dto.CheckInsertDto;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl;
+import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtCheckmstService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckmstService.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtCheckmstService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckmstService.java
index 80a2c56..c8035dd 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtCheckmstService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckmstService.java
@@ -1,11 +1,11 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckmst;
-import org.nl.wms.warehouse_management.service.dto.CheckInsertDto;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckmst;
+import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoreorlessdtlService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessdtlService.java
similarity index 77%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoreorlessdtlService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessdtlService.java
index 194100b..5e87e2c 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoreorlessdtlService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessdtlService.java
@@ -1,9 +1,9 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoreorlessdtl;
-import org.nl.wms.warehouse_management.service.dto.MoreOrLessInsertDto;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessdtl;
+import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoreorlessmstService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessmstService.java
similarity index 87%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoreorlessmstService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessmstService.java
index eb9f013..78d2781 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoreorlessmstService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessmstService.java
@@ -1,11 +1,11 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoreorlessmst;
-import org.nl.wms.warehouse_management.service.dto.MoreOrLessInsertDto;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessmst;
+import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoveinvService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoveinvService.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoveinvService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoveinvService.java
index 1bb0a45..61ca17d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoveinvService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoveinvService.java
@@ -1,13 +1,13 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoveinv;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoveinvdtl;
-import org.nl.wms.warehouse_management.service.dto.MoveInsertDto;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinv;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinvdtl;
+import org.nl.wms.warehouse_manage.service.dto.MoveInsertDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoveinvdtlService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoveinvdtlService.java
similarity index 81%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoveinvdtlService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoveinvdtlService.java
index 67f9faa..d7b827a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IStIvtMoveinvdtlService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoveinvdtlService.java
@@ -1,9 +1,9 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoveinvdtl;
-import org.nl.wms.warehouse_management.service.dto.MoveInsertDto;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinvdtl;
+import org.nl.wms.warehouse_manage.service.dto.MoveInsertDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/ReturnService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/ReturnService.java
similarity index 88%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/ReturnService.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/ReturnService.java
index c82cb50..85e6a81 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/ReturnService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/ReturnService.java
@@ -1,10 +1,10 @@
-package org.nl.wms.warehouse_management.service;
+package org.nl.wms.warehouse_manage.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.warehouse_management.service.dao.IOStorInv;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInv;
 
 import java.util.Map;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/GroupPlate.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/GroupPlate.java
index 7c7eedd..c34af0d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/GroupPlate.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInv.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInv.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInv.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInv.java
index a168c27..e7d74df 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInv.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInv.java
@@ -1,9 +1,7 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDis.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDis.java
index 43e1dd3..b2975a8 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDis.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDtl.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDtl.java
index b226709..63a2a05 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDtl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtCheckdtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtCheckdtl.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtCheckdtl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtCheckdtl.java
index e50fb0b..4e7c672 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtCheckdtl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtCheckdtl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtCheckmst.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtCheckmst.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtCheckmst.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtCheckmst.java
index 442a58c..0b45370 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtCheckmst.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtCheckmst.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoreorlessdtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoreorlessdtl.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoreorlessdtl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoreorlessdtl.java
index bb9e47f..4dc3e87 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoreorlessdtl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoreorlessdtl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoreorlessmst.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoreorlessmst.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoreorlessmst.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoreorlessmst.java
index 7700217..ad3c72e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoreorlessmst.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoreorlessmst.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoveinv.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoveinv.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoveinv.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoveinv.java
index e1f4384..ed911f9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoveinv.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoveinv.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoveinvdtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoveinvdtl.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoveinvdtl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoveinvdtl.java
index eeed7ec..e9f20a8 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/StIvtMoveinvdtl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/StIvtMoveinvdtl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dao;
+package org.nl.wms.warehouse_manage.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvDisMapper.java
similarity index 76%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvDisMapper.java
index ba04a8e..75b4e65 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvDisMapper.java
@@ -1,10 +1,10 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDisDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvDisMapper.xml
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvDisMapper.xml
index 9d69d34..e7bb413 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvDisMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper">
+<mapper namespace="org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDisMapper">
 
-    <select id="queryInBillDisDtlByIosId" resultType="org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto">
+    <select id="queryInBillDisDtlByIosId" resultType="org.nl.wms.warehouse_manage.service.dto.IOStorInvDisDto">
         SELECT
         dis.*,
         mb.material_code,
@@ -18,7 +18,7 @@
         </if>
     </select>
 
-    <select id="getBillTaskDtl" resultType="org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto">
+    <select id="getBillTaskDtl" resultType="org.nl.wms.warehouse_manage.service.dto.IOStorInvDisDto">
         SELECT
         dis.*,
         mb.material_code,
@@ -33,7 +33,7 @@
         dis.iostorinvdtl_id = #{iostorinvdtl_id}
     </select>
 
-    <select id="queryOutBillDisDtl" resultType="org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto">
+    <select id="queryOutBillDisDtl" resultType="org.nl.wms.warehouse_manage.service.dto.IOStorInvDisDto">
         SELECT
         dis.*,
         mb.material_code,
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDtlMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvDtlMapper.java
similarity index 63%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDtlMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvDtlMapper.java
index f0efc70..37b0cb2 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDtlMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvDtlMapper.java
@@ -1,8 +1,8 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDtl;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDtl;
 
 /**
  * @author dsh
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.java
similarity index 68%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.java
index 11219ec..c63b3d0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.java
@@ -1,13 +1,12 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.warehouse_management.service.dao.IOStorInv;
-import org.nl.wms.warehouse_management.service.dto.GroupPlateDto;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDtlDto;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInv;
+import org.nl.wms.warehouse_manage.service.dto.GroupPlateDto;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDtlDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.xml
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.xml
index c95adda..fdbe5ee 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvMapper">
-    <select id="queryAllByPage" resultType="org.nl.wms.warehouse_management.service.dao.IOStorInv">
+<mapper namespace="org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvMapper">
+    <select id="queryAllByPage" resultType="org.nl.wms.warehouse_manage.service.dao.IOStorInv">
         SELECT DISTINCT ios.* FROM st_ivt_iostorinv ios
             LEFT JOIN st_ivt_iostorinvdtl dtl ON ios.iostorinv_id = dtl.iostorinv_id
         LEFT JOIN st_ivt_iostorinvdis dis ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id
@@ -47,7 +47,7 @@
         ORDER BY ios.iostorinv_id Desc
     </select>
 
-    <select id="getGroupPlate" resultType="org.nl.wms.warehouse_management.service.dto.GroupPlateDto">
+    <select id="getGroupPlate" resultType="org.nl.wms.warehouse_manage.service.dto.GroupPlateDto">
         SELECT group_id,
                storagevehicle_code,
                gp.material_id,pcsn,
@@ -82,7 +82,7 @@
         </where>
     </select>
 
-    <select id="getIODtl" resultType="org.nl.wms.warehouse_management.service.dto.IOStorInvDtlDto">
+    <select id="getIODtl" resultType="org.nl.wms.warehouse_manage.service.dto.IOStorInvDtlDto">
         SELECT DISTINCT
             dtl.*,
             mb.material_code,
@@ -121,7 +121,7 @@
 
     </select>
 
-    <select id="queryOutBillPage" resultType="org.nl.wms.warehouse_management.service.dao.IOStorInv">
+    <select id="queryOutBillPage" resultType="org.nl.wms.warehouse_manage.service.dao.IOStorInv">
         SELECT DISTINCT ios.* FROM st_ivt_iostorinv ios
         LEFT JOIN st_ivt_iostorinvdtl dtl ON ios.iostorinv_id = dtl.iostorinv_id
         LEFT JOIN st_ivt_iostorinvdis dis ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.java
index 7d24b5d..d361ad1 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.java
@@ -1,11 +1,11 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml
index 6a6f37e..ff9d975 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/MdPbGroupplateMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper">
+<mapper namespace="org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper">
 
     <select id="getDtl" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.java
similarity index 87%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.java
index 4df0e1b..1e5c968 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.java
@@ -1,9 +1,9 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckdtl;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.xml
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.xml
index e65bfe8..8ff4979 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.StIvtCheckdtlMapper">
+<mapper namespace="org.nl.wms.warehouse_manage.service.dao.mapper.StIvtCheckdtlMapper">
 
     <select id="getDtl" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckmstMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.java
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckmstMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.java
index 0e1ced3..1789610 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckmstMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.java
@@ -1,7 +1,7 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckmst;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckmst;
 
 /**
  * <p>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.xml
similarity index 64%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.xml
index 75142bc..4abd8d2 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.coderule.dao.mapper.SysCodeRuleMapper">
+<mapper namespace="org.nl.wms.warehouse_manage.service.dao.mapper.StIvtCheckmstMapper">
 
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessdtlMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.java
similarity index 81%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessdtlMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.java
index 154b8d6..ca4fae3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessdtlMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.java
@@ -1,9 +1,9 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoreorlessdtl;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessdtl;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessdtlMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.xml
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessdtlMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.xml
index 02ae235..cbd69d4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessdtlMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.StIvtMoreorlessdtlMapper">
+<mapper namespace="org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoreorlessdtlMapper">
 
     <select id="queryMolDtl" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessmstMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.java
similarity index 84%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessmstMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.java
index ea63bea..772a260 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessmstMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.java
@@ -1,11 +1,11 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoreorlessmst;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessmst;
 
 import java.util.Map;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessmstMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.xml
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessmstMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.xml
index 97ba83a..bbe04a1 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoreorlessmstMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.StIvtMoreorlessmstMapper">
+<mapper namespace="org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoreorlessmstMapper">
 
     <select id="queryAllByPage" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvMapper.java
similarity index 84%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvMapper.java
index 2e997a1..1d23359 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvMapper.java
@@ -1,11 +1,11 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoveinv;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinv;
 
 import java.util.Map;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvMapper.xml
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvMapper.xml
index 79b30d6..3cb6bc6 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.StIvtMoveinvMapper">
+<mapper namespace="org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoveinvMapper">
 
     <select id="queryAllByPage" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvdtlMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvdtlMapper.java
similarity index 82%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvdtlMapper.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvdtlMapper.java
index f16c697..2669f86 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvdtlMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvdtlMapper.java
@@ -1,9 +1,9 @@
-package org.nl.wms.warehouse_management.service.dao.mapper;
+package org.nl.wms.warehouse_manage.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoveinvdtl;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinvdtl;
 
 import java.util.List;
 import java.util.Map;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvdtlMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvdtlMapper.xml
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvdtlMapper.xml
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvdtlMapper.xml
index 85cf4d1..38d8281 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtMoveinvdtlMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoveinvdtlMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.StIvtMoveinvdtlMapper">
+<mapper namespace="org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoveinvdtlMapper">
 
 
     <select id="getMoveDtl" resultType="com.alibaba.fastjson.JSONObject">
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/CheckInsertDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/CheckInsertDto.java
similarity index 95%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/CheckInsertDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/CheckInsertDto.java
index 5f1c82e..24068be 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/CheckInsertDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/CheckInsertDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dto;
+package org.nl.wms.warehouse_manage.service.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/GroupPlateDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/GroupPlateDto.java
similarity index 62%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/GroupPlateDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/GroupPlateDto.java
index 9f8723b..fa22660 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/GroupPlateDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/GroupPlateDto.java
@@ -1,10 +1,7 @@
-package org.nl.wms.warehouse_management.service.dto;
+package org.nl.wms.warehouse_manage.service.dto;
 
 import lombok.Data;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
 
 /**
  * @author dsh
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDisDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/IOStorInvDisDto.java
similarity index 79%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDisDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/IOStorInvDisDto.java
index 97d236c..39a9ad9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDisDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/IOStorInvDisDto.java
@@ -1,7 +1,7 @@
-package org.nl.wms.warehouse_management.service.dto;
+package org.nl.wms.warehouse_manage.service.dto;
 
 import lombok.Data;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDis;
 
 /**
  * @author dsh
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDtlDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/IOStorInvDtlDto.java
similarity index 77%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDtlDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/IOStorInvDtlDto.java
index 07abf3f..d2ca25c 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDtlDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/IOStorInvDtlDto.java
@@ -1,7 +1,7 @@
-package org.nl.wms.warehouse_management.service.dto;
+package org.nl.wms.warehouse_manage.service.dto;
 
 import lombok.Data;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDtl;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDtl;
 
 /**
  * @author dsh
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/MoreOrLessInsertDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/MoreOrLessInsertDto.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/MoreOrLessInsertDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/MoreOrLessInsertDto.java
index 4e81029..7a7c429 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/MoreOrLessInsertDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/MoreOrLessInsertDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dto;
+package org.nl.wms.warehouse_manage.service.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/MoveInsertDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/MoveInsertDto.java
similarity index 96%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/MoveInsertDto.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/MoveInsertDto.java
index 1738e85..bd8a973 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/MoveInsertDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/MoveInsertDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.dto;
+package org.nl.wms.warehouse_manage.service.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/MdPbGroupplateServiceImpl.java
similarity index 85%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/MdPbGroupplateServiceImpl.java
index d2d9117..1016f11 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/MdPbGroupplateServiceImpl.java
@@ -1,14 +1,14 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
-import org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper;
-import org.nl.wms.warehouse_management.service.util.UpdateIvtUtils;
+import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
+import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper;
+import org.nl.wms.warehouse_manage.service.util.UpdateIvtUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java
similarity index 98%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java
index f2b510f..eab1f2a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -16,7 +16,7 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.config.IdUtil;
+import org.nl.common.utils.IdUtil;;
 import org.nl.config.SpringContextHolder;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
 import org.nl.wms.basedata_manage.service.IBsrealStorattrService;
@@ -31,20 +31,20 @@ import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.dao.mapper.SchBasePointMapper;
 import org.nl.wms.sch_manage.service.util.tasks.StOutTask;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
-import org.nl.wms.warehouse_management.service.IOutBillService;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
-import org.nl.wms.warehouse_management.service.dao.IOStorInv;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDtl;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDtlMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDtlDto;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_manage.service.IOutBillService;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInv;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDtl;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDisMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDtlMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDisDto;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDtlDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
index 99967d7..c48cc2a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -20,7 +20,6 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
 import org.nl.wms.basedata_manage.service.IBsrealStorattrService;
-import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleextService;
 import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
 import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
@@ -30,20 +29,20 @@ import org.nl.wms.basedata_manage.service.dto.StrategyStructParam;
 import org.nl.wms.sch_manage.enums.StatusEnum;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.tasks.StInTask;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
-import org.nl.wms.warehouse_management.service.IRawAssistIStorService;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
-import org.nl.wms.warehouse_management.service.dao.IOStorInv;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDtl;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDtlMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvMapper;
-import org.nl.wms.warehouse_management.service.dto.GroupPlateDto;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto;
-import org.nl.wms.warehouse_management.service.dto.IOStorInvDtlDto;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_manage.service.IRawAssistIStorService;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInv;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDtl;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDisMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDtlMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvMapper;
+import org.nl.wms.warehouse_manage.service.dto.GroupPlateDto;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDisDto;
+import org.nl.wms.warehouse_manage.service.dto.IOStorInvDtlDto;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RetrunServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RetrunServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java
index 61ed7e2..34fefb9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RetrunServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -17,14 +17,14 @@ import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
 import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
 import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
-import org.nl.wms.ext.service.WmsToErpService;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.ReturnService;
-import org.nl.wms.warehouse_management.service.dao.IOStorInv;
-import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
-import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvMapper;
+import org.nl.wms.ext_manage.service.WmsToErpService;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.ReturnService;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInv;
+import org.nl.wms.warehouse_manage.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvDisMapper;
+import org.nl.wms.warehouse_manage.service.dao.mapper.IOStorInvMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckdtlServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckdtlServiceImpl.java
similarity index 87%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckdtlServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckdtlServiceImpl.java
index d44b2f8..18743e2 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckdtlServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckdtlServiceImpl.java
@@ -1,20 +1,20 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.utils.IdUtil;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IStIvtCheckdtlService;
-import org.nl.wms.warehouse_management.service.IStIvtCheckmstService;
-import org.nl.wms.warehouse_management.service.IStIvtMoreorlessmstService;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckdtl;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckmst;
-import org.nl.wms.warehouse_management.service.dao.mapper.StIvtCheckdtlMapper;
-import org.nl.wms.warehouse_management.service.dto.CheckInsertDto;
-import org.nl.wms.warehouse_management.service.dto.MoreOrLessInsertDto;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IStIvtCheckdtlService;
+import org.nl.wms.warehouse_manage.service.IStIvtCheckmstService;
+import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessmstService;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckmst;
+import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtCheckdtlMapper;
+import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto;
+import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckmstServiceImpl.java
similarity index 93%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckmstServiceImpl.java
index 5ca87ce..0db92c0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckmstServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -15,14 +15,14 @@ import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IStIvtCheckdtlService;
-import org.nl.wms.warehouse_management.service.IStIvtCheckmstService;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckdtl;
-import org.nl.wms.warehouse_management.service.dao.StIvtCheckmst;
-import org.nl.wms.warehouse_management.service.dao.mapper.StIvtCheckmstMapper;
-import org.nl.wms.warehouse_management.service.dto.CheckInsertDto;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IStIvtCheckdtlService;
+import org.nl.wms.warehouse_manage.service.IStIvtCheckmstService;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl;
+import org.nl.wms.warehouse_manage.service.dao.StIvtCheckmst;
+import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtCheckmstMapper;
+import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoreorlessdtlServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessdtlServiceImpl.java
similarity index 82%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoreorlessdtlServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessdtlServiceImpl.java
index 006d47e..b9b05bc 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoreorlessdtlServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessdtlServiceImpl.java
@@ -1,13 +1,13 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.utils.IdUtil;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IStIvtMoreorlessdtlService;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoreorlessdtl;
-import org.nl.wms.warehouse_management.service.dao.mapper.StIvtMoreorlessdtlMapper;
-import org.nl.wms.warehouse_management.service.dto.MoreOrLessInsertDto;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessdtlService;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessdtl;
+import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoreorlessdtlMapper;
+import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoreorlessmstServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessmstServiceImpl.java
similarity index 89%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoreorlessmstServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessmstServiceImpl.java
index 5c75018..17b7c37 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoreorlessmstServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessmstServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -11,15 +11,15 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IStIvtMoreorlessdtlService;
-import org.nl.wms.warehouse_management.service.IStIvtMoreorlessmstService;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoreorlessdtl;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoreorlessmst;
-import org.nl.wms.warehouse_management.service.dao.mapper.StIvtMoreorlessmstMapper;
-import org.nl.wms.warehouse_management.service.dto.MoreOrLessInsertDto;
-import org.nl.wms.warehouse_management.service.util.UpdateIvtUtils;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessdtlService;
+import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessmstService;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessdtl;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessmst;
+import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoreorlessmstMapper;
+import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto;
+import org.nl.wms.warehouse_manage.service.util.UpdateIvtUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoveinvServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
similarity index 94%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoveinvServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
index 225d387..aa53906 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoveinvServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -12,7 +12,6 @@ import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
-import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleextService;
 import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
@@ -20,15 +19,15 @@ import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.tasks.MoveTask;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
-import org.nl.wms.warehouse_management.service.IStIvtMoveinvService;
-import org.nl.wms.warehouse_management.service.IStIvtMoveinvdtlService;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoveinv;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoveinvdtl;
-import org.nl.wms.warehouse_management.service.dao.mapper.StIvtMoveinvMapper;
-import org.nl.wms.warehouse_management.service.dto.MoveInsertDto;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_manage.service.IStIvtMoveinvService;
+import org.nl.wms.warehouse_manage.service.IStIvtMoveinvdtlService;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinv;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinvdtl;
+import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoveinvMapper;
+import org.nl.wms.warehouse_manage.service.dto.MoveInsertDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoveinvdtlServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvdtlServiceImpl.java
similarity index 92%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoveinvdtlServiceImpl.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvdtlServiceImpl.java
index 1e9abbd..75a1102 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtMoveinvdtlServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvdtlServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.impl;
+package org.nl.wms.warehouse_manage.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -8,21 +8,19 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.utils.IdUtil;
 import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
-import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleextService;
 import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.sch_manage.enums.TaskEnum;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
-import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.tasks.MoveTask;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
-import org.nl.wms.warehouse_management.service.IStIvtMoveinvdtlService;
-import org.nl.wms.warehouse_management.service.dao.StIvtMoveinvdtl;
-import org.nl.wms.warehouse_management.service.dao.mapper.StIvtMoveinvdtlMapper;
-import org.nl.wms.warehouse_management.service.dto.MoveInsertDto;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_manage.service.IStIvtMoveinvdtlService;
+import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinvdtl;
+import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoveinvdtlMapper;
+import org.nl.wms.warehouse_manage.service.dto.MoveInsertDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/util/UpdateIvtUtils.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java
similarity index 97%
rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/util/UpdateIvtUtils.java
rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java
index 4c5ca85..c0a9acd 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/util/UpdateIvtUtils.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java
@@ -1,4 +1,4 @@
-package org.nl.wms.warehouse_management.service.util;
+package org.nl.wms.warehouse_manage.service.util;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleextService;
-import org.nl.wms.warehouse_management.enums.IOSConstant;
-import org.nl.wms.warehouse_management.enums.IOSEnum;
-import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
-import org.nl.wms.warehouse_management.service.dao.GroupPlate;
+import org.nl.wms.warehouse_manage.enums.IOSConstant;
+import org.nl.wms.warehouse_manage.enums.IOSEnum;
+import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckmstMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckmstMapper.xml
deleted file mode 100644
index 9080108..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckmstMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.StIvtCheckmstMapper">
-
-</mapper>
diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
index 6af346c..5454d3f 100644
--- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
+++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
@@ -9,7 +9,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:wms_oulun}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms_fujia}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       # url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms_oulun}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
diff --git a/nladmin-system/nlsso-server/src/main/resources/log/ErpToWms.xml b/nladmin-system/nlsso-server/src/main/resources/log/ErpToWms.xml
deleted file mode 100644
index 3d60c0e..0000000
--- a/nladmin-system/nlsso-server/src/main/resources/log/ErpToWms.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE_ERPTOWMS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ErpToWms/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>2GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>${log.charset}</charset>
-        </encoder>
-
-    </appender>
-    <!-- 打印sql -->
-    <logger name="org.nl.wms.ext.service.impl.ErpToWmsServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE_ERPTOWMS"/>
-    </logger>
-</included>
diff --git a/nladmin-system/nlsso-server/src/main/resources/log/SendAcsTask.xml b/nladmin-system/nlsso-server/src/main/resources/log/SendAcsTask.xml
deleted file mode 100644
index 9d97a99..0000000
--- a/nladmin-system/nlsso-server/src/main/resources/log/SendAcsTask.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE_SENDTASK" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/SendAcsTask/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>2GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>${log.charset}</charset>
-        </encoder>
-
-    </appender>
-    <!-- 打印sql -->
-    <logger name="org.nl.wms.ext.util.AcsUtil" level="info" additivity="false">
-        <appender-ref ref="FILE_SENDTASK"/>
-    </logger>
-</included>
diff --git a/nladmin-system/nlsso-server/src/main/resources/log/WmsToErp.xml b/nladmin-system/nlsso-server/src/main/resources/log/WmsToErp.xml
deleted file mode 100644
index 6684b21..0000000
--- a/nladmin-system/nlsso-server/src/main/resources/log/WmsToErp.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE_WMSTOERP" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/WmsToErp/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>2GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>${log.charset}</charset>
-        </encoder>
-
-    </appender>
-    <!-- 打印sql -->
-    <logger name="org.nl.wms.ext.service.impl.WmsToErpServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE_WMSTOERP"/>
-    </logger>
-</included>
diff --git a/nladmin-ui/.env.development b/nladmin-ui/.env.development
index 6372089..e37a9a4 100644
--- a/nladmin-ui/.env.development
+++ b/nladmin-ui/.env.development
@@ -2,7 +2,7 @@ ENV = 'development'
 
 # 接口地址
 VUE_APP_BASE_API  = 'http://localhost:8011'
-VUE_APP_WS_API = 'ws://localhost:801'
+VUE_APP_WS_API = 'ws://localhost:8011'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/nladmin-ui/.env.production b/nladmin-ui/.env.production
index 8d06dfb..4ce9728 100644
--- a/nladmin-ui/.env.production
+++ b/nladmin-ui/.env.production
@@ -2,6 +2,6 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'http://10.93.41.201:8011'
+VUE_APP_BASE_API  = 'http://localhost:8011'
 # 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'ws://10.93.41.201:8010'
+VUE_APP_WS_API = 'ws://localhost:8011'
diff --git a/nladmin-ui/public/screen/index.html b/nladmin-ui/public/screen/index.html
new file mode 100644
index 0000000..4acbce0
--- /dev/null
+++ b/nladmin-ui/public/screen/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><title>北安可视化看板</title><link href=./static/css/app.d21fc9eece1277d59ed609fbf76ae4f2.css rel=stylesheet></head><body class=clearfix><div id=app></div><script type=text/javascript src=./static/js/manifest.d8d42b5e48ef97893c22.js></script><script type=text/javascript src=./static/js/app.8b7a67845ece6e48ac40.js></script></body></html>
\ No newline at end of file
diff --git a/nladmin-ui/src/i18n/langs/zh-CN.js b/nladmin-ui/src/i18n/langs/zh-CN.js
index a281269..fb1109e 100644
--- a/nladmin-ui/src/i18n/langs/zh-CN.js
+++ b/nladmin-ui/src/i18n/langs/zh-CN.js
@@ -2,7 +2,7 @@ export default {
   'lang': 'zh',
   // 平台
   'platform': {
-    'title': '欧伦电气WMS系统',
+    'title': 'c',
     'tip1': '用户名不能为空',
     'tip2': '密码不能为空',
     'tip3': '验证码不能为空'
diff --git a/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/nladmin-ui/src/layout/components/Sidebar/Logo.vue
index 2d4cb09..eacfba3 100644
--- a/nladmin-ui/src/layout/components/Sidebar/Logo.vue
+++ b/nladmin-ui/src/layout/components/Sidebar/Logo.vue
@@ -26,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '欧伦电气WMS系统',
+      title: 'WMS系统',
       logo: Logo,
       title_param: 'platform'
     }
diff --git a/nladmin-ui/src/views/generator/config.vue b/nladmin-ui/src/views/generator/config.vue
deleted file mode 100644
index ec72ea4..0000000
--- a/nladmin-ui/src/views/generator/config.vue
+++ /dev/null
@@ -1,328 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="15">
-      <el-col style="margin-bottom: 10px">
-        <el-card class="box-card" shadow="never">
-          <div slot="header" class="clearfix">
-            <span class="role-span">字段配置：{{ table_name }}</span>
-            <el-button
-              :loading="genLoading"
-              icon="el-icon-s-promotion"
-              size="mini"
-              style="float: right; padding: 6px 9px;"
-              type="success"
-              @click="toGen"
-            >保存&生成</el-button>
-            <el-button
-              :loading="columnLoading"
-              icon="el-icon-check"
-              size="mini"
-              style="float: right; padding: 6px 9px;margin-right: 9px"
-              type="primary"
-              @click="saveColumnConfig"
-            >保存</el-button>
-            <el-tooltip class="item" effect="dark" content="数据库中表字段变动时使用该功能" placement="top-start">
-              <el-button
-                :loading="syncLoading"
-                icon="el-icon-refresh"
-                size="mini"
-                style="float: right; padding: 6px 9px;"
-                type="info"
-                @click="sync"
-              >同步</el-button>
-            </el-tooltip>
-          </div>
-          <el-form size="mini" label-width="90px">
-            <el-table v-loading="loading" :data="data" :max-height="tableHeight" size="mini" style="width: 100%;margin-bottom: 15px">
-              <el-table-column prop="column_name" label="字段名称" />
-              <el-table-column prop="column_type" label="字段类型" />
-              <el-table-column prop="remark" label="字段描述">
-                <template slot-scope="scope">
-                  <el-input v-model="data[scope.$index].remark" size="mini" class="edit-input" />
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="必填" width="70px">
-                <template slot-scope="scope">
-                  <el-checkbox v-model="data[scope.$index].not_null" />
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="列表" width="70px">
-                <template slot-scope="scope">
-                  <el-checkbox v-model="data[scope.$index].list_show" />
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="表单" width="70px">
-                <template slot-scope="scope">
-                  <el-checkbox v-model="data[scope.$index].form_show" />
-                </template>
-              </el-table-column>
-              <el-table-column label="表单类型">
-                <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].form_type" filterable class="edit-input" clearable size="mini" placeholder="请选择">
-                    <el-option
-                      label="文本框"
-                      value="Input"
-                    />
-                    <el-option
-                      label="文本域"
-                      value="Textarea"
-                    />
-                    <el-option
-                      label="单选框"
-                      value="Radio"
-                    />
-                    <el-option
-                      label="下拉框"
-                      value="Select"
-                    />
-                    <el-option
-                      label="日期框"
-                      value="Date"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="查询方式">
-                <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].query_type" filterable class="edit-input" clearable size="mini" placeholder="请选择">
-                    <el-option
-                      label="="
-                      value="="
-                    />
-                    <el-option
-                      label="!="
-                      value="!="
-                    />
-                    <el-option
-                      label=">="
-                      value=">="
-                    />
-                    <el-option
-                      label="<="
-                      value="<="
-                    />
-                    <el-option
-                      label="Like"
-                      value="Like"
-                    />
-                    <el-option
-                      label="not_null"
-                      value="not_null"
-                    />
-                    <el-option
-                      label="BetWeen"
-                      value="BetWeen"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="日期注解">
-                <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].date_annotation" filterable class="edit-input" clearable size="mini" placeholder="请选择">
-                    <el-option
-                      label="自动创建时间"
-                      value="CreationTimestamp"
-                    />
-                    <el-option
-                      label="自动更新时间"
-                      value="UpdateTimestamp"
-                    />
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="关联字典">
-                <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].dict_name" filterable class="edit-input" clearable size="mini" placeholder="请选择">
-                    <el-option v-for="item in dicts" :key="item.dict_id" :label="item.code === '' ? item.name : item.code" :value="item.code">
-                      <span style="float: left">{{ item.code }}</span>
-                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form>
-        </el-card>
-      </el-col>
-      <el-col>
-        <el-card class="box-card" shadow="never">
-          <div slot="header" class="clearfix">
-            <span class="role-span">生成配置</span>
-            <el-button
-              :loading="configLoading"
-              icon="el-icon-check"
-              size="mini"
-              style="float: right; padding: 6px 9px"
-              type="primary"
-              @click="doSubmit"
-            >保存</el-button>
-          </div>
-          <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="78px">
-            <el-form-item label="作者名称" prop="author">
-              <el-input v-model="form.author" style="width: 40%" />
-              <span style="color: #C0C0C0;margin-left: 10px;">类上面的作者名称</span>
-            </el-form-item>
-            <el-form-item label="模块名称" prop="module_name">
-              <el-input v-model="form.module_name" style="width: 40%" />
-              <span style="color: #C0C0C0;margin-left: 10px;">模块的名称，请选择项目中已存在的模块</span>
-            </el-form-item>
-            <el-form-item label="至于包下" prop="pack">
-              <el-input v-model="form.pack" style="width: 40%" />
-              <span style="color: #C0C0C0;margin-left: 10px;">项目包的名称，生成的代码放到哪个包里面</span>
-            </el-form-item>
-            <el-form-item label="接口名称" prop="apiAlias">
-              <el-input v-model="form.api_alias" style="width: 40%" />
-              <span style="color: #C0C0C0;margin-left: 10px;">接口的名称，用于控制器与接口文档中</span>
-            </el-form-item>
-            <el-form-item label="前端路径" prop="path">
-              <el-input v-model="form.path" style="width: 40%" />
-              <span style="color: #C0C0C0;margin-left: 10px;">输入views文件夹下的目录，不存在即创建</span>
-            </el-form-item>
-            <!--            <el-form-item label="接口目录">-->
-            <!--              <el-input v-model="form.apiPath" style="width: 40%" />-->
-            <!--              <span style="color: #C0C0C0;margin-left: 10px;">Api存放路径[src/api]，为空则自动生成路径</span>-->
-            <!--            </el-form-item>-->
-            <el-form-item label="去表前缀" prop="prefix">
-              <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 40%" />
-              <span style="color: #C0C0C0;margin-left: 10px;">默认不去除表前缀，可自定义</span>
-            </el-form-item>
-            <el-form-item label="是否覆盖" prop="cover">
-              <el-radio-group v-model="form.cover" size="mini" style="width: 40%">
-                <el-radio-button label="true">是</el-radio-button>
-                <el-radio-button label="false">否</el-radio-button>
-              </el-radio-group>
-              <span style="color: #C0C0C0;margin-left: 10px;">谨防误操作，请慎重选择</span>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import crud from '@/mixins/crud'
-import { update, get } from '@/views/generator/genConfig'
-import { save, sync, generator } from '@/views/generator/generator'
-import { getDicts } from '@/views/system/dict/dict'
-export default {
-  name: 'GeneratorConfig',
-  components: {},
-  mixins: [crud],
-  data() {
-    return {
-      activeName: 'first', table_name: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], syncLoading: false, genLoading: false,
-      form: { id: null, table_name: '', author: '', pack: '', path: '', module_name: '', cover: 'false', apiPath: '', prefix: '', api_alias: null },
-      rules: {
-        author: [
-          { required: true, message: '作者不能为空', trigger: 'blur' }
-        ],
-        pack: [
-          { required: true, message: '包路径不能为空', trigger: 'blur' }
-        ],
-        module_name: [
-          { required: true, message: '包路径不能为空', trigger: 'blur' }
-        ],
-        path: [
-          { required: true, message: '前端路径不能为空', trigger: 'blur' }
-        ],
-        api_alias: [
-          { required: true, message: '接口名称不能为空', trigger: 'blur' }
-        ],
-        cover: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.tableHeight = document.documentElement.clientHeight - 385
-    this.table_name = this.$route.params.tableName
-    this.$nextTick(() => {
-      this.init()
-      get(this.table_name).then(data => { // 获取作者等信息
-        this.form = data
-        this.form.cover = this.form.cover.toString()
-      })
-      getDicts().then(data => {
-        this.dicts = data
-      })
-    })
-  },
-  methods: {
-    beforeInit() {
-      this.url = 'api/generator/columns'
-      const tableName = this.table_name
-      this.params = { tableName }
-      return true
-    },
-    saveColumnConfig() {
-      this.columnLoading = true
-      save(this.data).then(res => {
-        this.notify('保存成功', 'success')
-        this.columnLoading = false
-      }).catch(err => {
-        this.columnLoading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.configLoading = true
-          update(this.form).then(res => {
-            this.notify('保存成功', 'success')
-            this.form = res
-            this.form.cover = this.form.cover.toString()
-            this.configLoading = false
-          }).catch(err => {
-            this.configLoading = false
-            console.log(err.response.data.message)
-          })
-        }
-      })
-    },
-    sync() {
-      this.syncLoading = true
-      sync([this.table_name]).then(() => {
-        this.init()
-        this.notify('同步成功', 'success')
-        this.syncLoading = false
-      }).then(() => {
-        this.syncLoading = false
-      })
-    },
-    toGen() {
-      this.genLoading = true
-      save(this.data).then(res => {
-        this.notify('保存成功', 'success')
-        // 生成代码
-        generator(this.table_name, 0).then(data => {
-          this.genLoading = false
-          this.notify('生成成功', 'success')
-        }).catch(err => {
-          this.genLoading = false
-          console.log(err.response.data.message)
-        })
-      }).catch(err => {
-        this.genLoading = false
-        console.log(err.response.data.message)
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-.edit-input {
-  .el-input__inner {
-    border: 1px solid #e5e6e7;
-  }
-}
-</style>
-
-<style scoped>
-::v-deep .input-with-select .el-input-group__prepend {
-  background-color: #fff;
-}
-</style>
diff --git a/nladmin-ui/src/views/generator/genConfig.js b/nladmin-ui/src/views/generator/genConfig.js
deleted file mode 100644
index e15b200..0000000
--- a/nladmin-ui/src/views/generator/genConfig.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import request from '@/utils/request'
-
-export function get(tableName) {
-  return request({
-    url: 'api/genConfig/' + tableName,
-    method: 'get'
-  })
-}
-
-export function update(data) {
-  return request({
-    url: 'api/genConfig',
-    data,
-    method: 'put'
-  })
-}
diff --git a/nladmin-ui/src/views/generator/generator.js b/nladmin-ui/src/views/generator/generator.js
deleted file mode 100644
index 0c49718..0000000
--- a/nladmin-ui/src/views/generator/generator.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import request from '@/utils/request'
-
-export function getAllTable() {
-  return request({
-    url: 'api/generator/tables/all',
-    method: 'get'
-  })
-}
-
-export function generator(tableName, type) {
-  return request({
-    url: 'api/generator/' + tableName + '/' + type,
-    method: 'post',
-    responseType: type === 2 ? 'blob' : ''
-  })
-}
-
-export function save(data) {
-  return request({
-    url: 'api/generator',
-    data,
-    method: 'put'
-  })
-}
-
-export function sync(tables) {
-  return request({
-    url: 'api/generator/sync',
-    method: 'post',
-    data: tables
-  })
-}
-
diff --git a/nladmin-ui/src/views/generator/index.vue b/nladmin-ui/src/views/generator/index.vue
deleted file mode 100644
index b4df607..0000000
--- a/nladmin-ui/src/views/generator/index.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-input v-model="query.name" clearable size="mini" placeholder="请输入表名" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <rrOperation />
-      </div>
-      <crudOperation>
-        <el-tooltip slot="right" class="item" effect="dark" content="数据库中表字段变动时使用该功能" placement="top-start">
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="success"
-            icon="el-icon-refresh"
-            :loading="syncLoading"
-            :disabled="crud.selections.length === 0"
-            @click="sync"
-          >同步</el-button>
-        </el-tooltip>
-      </crudOperation>
-    </div>
-    <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-      <el-table-column type="selection" width="55" />
-      <el-table-column show-overflow-tooltip prop="table_name" label="表名" />
-      <el-table-column show-overflow-tooltip prop="engine" label="数据库引擎" />
-      <el-table-column show-overflow-tooltip prop="coding" label="字符编码集" />
-      <el-table-column show-overflow-tooltip prop="remark" label="备注" />
-      <el-table-column prop="create_time" label="创建日期">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.create_time) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="160px" align="center" fixed="right">
-        <template slot-scope="scope">
-          <el-button size="mini" style="margin-right: 2px" type="text">
-            <router-link :to="'/sys-tools/generator/preview/' + scope.row.table_name">
-              预览
-            </router-link>
-          </el-button>
-          <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="toDownload(scope.row.table_name)">下载</el-button>
-          <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text">
-            <router-link :to="'/sys-tools/generator/config/' + scope.row.table_name">
-              配置
-            </router-link>
-          </el-button>
-          <el-button type="text" style="margin-left: -1px" size="mini" @click="toGen(scope.row.table_name)">生成</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-  </div>
-</template>
-
-<script>
-
-import { generator, sync } from '@/views/generator/generator'
-import { downloadFile } from '@/utils/index'
-import CRUD, { presenter, header } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-
-export default {
-  name: 'GeneratorIndex',
-  components: { pagination, crudOperation, rrOperation },
-  cruds() {
-    return CRUD({ url: 'api/generator/tables' })
-  },
-  mixins: [presenter(), header()],
-  data() {
-    return {
-      syncLoading: false
-    }
-  },
-  created() {
-    this.crud.optShow = { add: false, edit: false, del: false, download: false }
-  },
-  methods: {
-    toGen(table_name) {
-      // 生成代码
-      generator(table_name, 0).then(data => {
-        this.$notify({
-          title: '生成成功',
-          type: 'success',
-          duration: 2500
-        })
-      })
-    },
-    toDownload(table_name) {
-      // 打包下载
-      generator(table_name, 2).then(data => {
-        downloadFile(data, table_name, 'zip')
-      })
-    },
-    sync() {
-      const tables = []
-      this.crud.selections.forEach(val => {
-        tables.push(val.table_name)
-      })
-      this.syncLoading = true
-      sync(tables).then(() => {
-        this.crud.refresh()
-        this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.syncLoading = false
-      }).then(() => {
-        this.syncLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/generator/preview.vue b/nladmin-ui/src/views/generator/preview.vue
deleted file mode 100644
index 8d1777c..0000000
--- a/nladmin-ui/src/views/generator/preview.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
-  <el-tabs v-model="activeName" type="card">
-    <el-tab-pane v-for="item in data" :key="item.name" :lazy="true" :label="item.name" :name="item.name">
-      <Java :value="item.content" :height="height" />
-    </el-tab-pane>
-  </el-tabs>
-</template>
-
-<script>
-import Java from '@/components/JavaEdit/index'
-import { generator } from '@/views/generator/generator'
-export default {
-  name: 'Preview',
-  components: { Java },
-  data() {
-    return {
-      data: null, height: '', activeName: 'Dto'
-    }
-  },
-  created() {
-    this.height = document.documentElement.clientHeight - 180 + 'px'
-    const tableName = this.$route.params.tableName
-    generator(tableName, 1).then(data => {
-      this.data = data
-    }).catch(() => {
-      this.$router.go(-1)
-    })
-  }
-}
-</script>
diff --git a/nladmin-ui/src/views/monitor/server/index.vue b/nladmin-ui/src/views/monitor/server/index.vue
index a1e9877..934d97f 100644
--- a/nladmin-ui/src/views/monitor/server/index.vue
+++ b/nladmin-ui/src/views/monitor/server/index.vue
@@ -1,136 +1,12 @@
 <template>
-  <div v-loading="!show" :element-loading-text="$t('common.loading')" :style="!show ? 'height: 500px' : 'height: 100%'" class="app-container">
-    <div v-if="show">
-      <el-card class="box-card">
-        <div style="color: #666;font-size: 13px;">
-          <svg-icon icon-class="system" style="margin-right: 5px" />
-          <span>
-            {{ $t('monitor.sys') }}：{{ data.sys.os }}
-          </span>
-          <span>
-            IP：{{ data.sys.ip }}
-          </span>
-          <span>
-            {{ $t('monitor.day') }}：{{ data.sys.day }}
-          </span>
-          <i class="el-icon-refresh" style="margin-left: 40px" @click="init" />
-        </div>
-      </el-card>
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
-          <span style="font-weight: bold;color: #666;font-size: 15px">{{ $t('monitor.status') }}</span>
-        </div>
-        <div>
-          <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
-            <div class="title">{{ $t('monitor.cpu') }}</div>
-            <el-tooltip placement="top-end">
-              <div slot="content" style="font-size: 12px;">
-                <div style="padding: 3px;">
-                  {{ data.cpu.name }}
-                </div>
-                <div style="padding: 3px">
-                  {{ data.cpu.package }}
-                </div>
-                <div style="padding: 3px">
-                  {{ data.cpu.core }}
-                </div>
-                <div style="padding: 3px">
-                  {{ data.cpu.logic }}
-                </div>
-              </div>
-              <div class="content">
-                <el-progress type="dashboard" :percentage="parseFloat(data.cpu.used)" />
-              </div>
-            </el-tooltip>
-            <div class="footer">{{ data.cpu.coreNumber }} {{ $t('monitor.core') }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
-            <div class="title">{{ $t('monitor.memory') }}</div>
-            <el-tooltip placement="top-end">
-              <div slot="content" style="font-size: 12px;">
-                <div style="padding: 3px;">
-                  {{ $t('monitor.tality') }}：{{ data.memory.total }}
-                </div>
-                <div style="padding: 3px">
-                  {{ $t('monitor.used') }}：{{ data.memory.used }}
-                </div>
-                <div style="padding: 3px">
-                  {{ $t('monitor.leisure') }}：{{ data.memory.available }}
-                </div>
-              </div>
-              <div class="content">
-                <el-progress type="dashboard" :percentage="parseFloat(data.memory.usageRate)" />
-              </div>
-            </el-tooltip>
-            <div class="footer">{{ data.memory.used }} / {{ data.memory.total }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
-            <div class="title">{{ $t('monitor.exchange') }}</div>
-            <el-tooltip placement="top-end">
-              <div slot="content" style="font-size: 12px;">
-                <div style="padding: 3px;">
-                  {{ $t('monitor.tality') }}：{{ data.swap.total }}
-                </div>
-                <div style="padding: 3px">
-                  {{ $t('monitor.used') }}：{{ data.swap.used }}
-                </div>
-                <div style="padding: 3px">
-                  {{ $t('monitor.leisure') }}：{{ data.swap.available }}
-                </div>
-              </div>
-              <div class="content">
-                <el-progress type="dashboard" :percentage="parseFloat(data.swap.usageRate)" />
-              </div>
-            </el-tooltip>
-            <div class="footer">{{ data.swap.used }} / {{ data.swap.total }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
-            <div class="title">{{ $t('monitor.disk') }}</div>
-            <div class="content">
-              <el-tooltip placement="top-end">
-                <div slot="content" style="font-size: 12px;">
-                  <div style="padding: 3px">
-                    {{ $t('monitor.tality') }}：{{ data.disk.total }}
-                  </div>
-                  <div style="padding: 3px">
-                    {{ $t('monitor.leisure') }}：{{ data.disk.available }}
-                  </div>
-                </div>
-                <div class="content">
-                  <el-progress type="dashboard" :percentage="parseFloat(data.disk.usageRate)" />
-                </div>
-              </el-tooltip>
-            </div>
-            <div class="footer">{{ data.disk.used }} / {{ data.disk.total }}</div>
-          </el-col>
-        </div>
-      </el-card>
-
-      <div>
-        <el-row :gutter="6">
-          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px">
-            <el-card class="box-card">
-              <div slot="header" class="clearfix">
-                <span style="font-weight: bold;color: #666;font-size: 15px">{{ $t('monitor.cpu_monitoring') }}</span>
-              </div>
-              <div>
-                <v-chart :options="cpuInfo" />
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px">
-            <el-card class="box-card">
-              <div slot="header" class="clearfix">
-                <span style="font-weight: bold;color: #666;font-size: 15px">{{ $t('monitor.memory_monitoring') }}</span>
-              </div>
-              <div>
-                <v-chart :options="memoryInfo" />
-              </div>
-            </el-card>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
+  <div style="height:1000px">
+    <iframe
+      src="/screen/index.html"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      allowfullscreen
+    ></iframe>
   </div>
 </template>
 
@@ -230,22 +106,22 @@ export default {
     clearInterval(this.monitor)
   },
   methods: {
-    init() {
-      initData(this.url, {}).then(data => {
-        this.data = data
-        this.show = true
-        if (this.cpuInfo.xAxis.data.length >= 8) {
-          this.cpuInfo.xAxis.data.shift()
-          this.memoryInfo.xAxis.data.shift()
-          this.cpuInfo.series[0].data.shift()
-          this.memoryInfo.series[0].data.shift()
-        }
-        this.cpuInfo.xAxis.data.push(data.time)
-        this.memoryInfo.xAxis.data.push(data.time)
-        this.cpuInfo.series[0].data.push(parseFloat(data.cpu.used))
-        this.memoryInfo.series[0].data.push(parseFloat(data.memory.usageRate))
-      })
-    }
+    // init() {
+    //   initData(this.url, {}).then(data => {
+    //     this.data = data
+    //     this.show = true
+    //     if (this.cpuInfo.xAxis.data.length >= 8) {
+    //       this.cpuInfo.xAxis.data.shift()
+    //       this.memoryInfo.xAxis.data.shift()
+    //       this.cpuInfo.series[0].data.shift()
+    //       this.memoryInfo.series[0].data.shift()
+    //     }
+    //     this.cpuInfo.xAxis.data.push(data.time)
+    //     this.memoryInfo.xAxis.data.push(data.time)
+    //     this.cpuInfo.series[0].data.push(parseFloat(data.cpu.used))
+    //     this.memoryInfo.series[0].data.push(parseFloat(data.memory.usageRate))
+    //   })
+    // }
   }
 }
 </script>
diff --git a/nladmin-ui/src/views/wms/basedata/group/index.vue b/nladmin-ui/src/views/wms/basedata/group/index.vue
index 77dd506..e9d228c 100644
--- a/nladmin-ui/src/views/wms/basedata/group/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/group/index.vue
@@ -2,45 +2,46 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="80px"
-          label-suffix=":"
-        >
-          <el-form-item label="物料查询">
+        <el-row>
+          <el-col :span="4">
+            物料查询：
             <el-input
               v-model="query.material_code"
               clearable
+              style="width: 150px"
               size="mini"
               placeholder="物料编码、名称"
               @keyup.enter.native="crud.toQuery"
             />
-          </el-form-item>
-          <el-form-item label="批次号">
+          </el-col>
+          <el-col :span="4">
+            批次查询：
             <el-input
               v-model="query.pcsn"
               clearable
+              style="width: 150px"
               size="mini"
               placeholder="批次"
               @keyup.enter.native="crud.toQuery"
             />
-          </el-form-item>
-          <el-form-item label="载具编码">
+          </el-col>
+          <el-col :span="4">
+            载具编码：
             <el-input
               v-model="query.storagevehicle_code"
               clearable
+              style="width: 150px"
               size="mini"
               placeholder="载具编码"
               @keyup.enter.native="crud.toQuery"
             />
-          </el-form-item>
-          <el-form-item label="状态">
+          </el-col>
+          <el-col :span="4">
+            组盘状态：
             <el-select
               v-model="query.status"
               clearable
+              style="width: 150px"
               size="mini"
               placeholder="状态"
               class="filter-item"
@@ -52,13 +53,73 @@
                 :value="item.value"
               />
             </el-select>
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-      </div>
-      <rrOperation />
+          </el-col>
+          <el-col :span="4">
+            <rrOperation />
+          </el-col>
+        </el-row>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
+      <!--新增表格-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="1200px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="物料编码" prop="material_code" >
+                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="物料名称" prop="material_name">
+                <el-input v-model="form.material_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+
+              <el-form-item label="规格" prop="material_spec">
+                <label slot="label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>
+                <el-input v-model="form.material_spec" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="型号" prop="material_model">
+                <label slot="label">型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                <el-input v-model="form.material_model" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="外部标识" prop="ext_id">
+                <el-input v-model="form.ext_id" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="静置时间" prop="standing_time">
+                <el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="是否启用" prop="is_used">
+                <el-radio v-model="form.is_used" label="0">否</el-radio>
+                <el-radio v-model="form.is_used" label="1">是</el-radio>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -134,7 +195,7 @@ export default {
       title: '组盘记录',
       url: 'api/group',
       optShow: {
-        add: false,
+        add: true,
         reset: true
       },
       idField: 'group_id',
diff --git a/nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue b/nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue
new file mode 100644
index 0000000..f526491
--- /dev/null
+++ b/nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue
@@ -0,0 +1,125 @@
+<template>
+  <el-dialog
+    title="导入Excel文件"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="400px"
+    :show-close="true"
+    @close="close"
+    @open="open"
+  >
+    <el-upload
+      ref="upload"
+      class="upload-demo"
+      action=""
+      drag
+      :on-exceed="is_one"
+      :limit="1"
+      :auto-upload="false"
+      :multiple="false"
+      :show-file-list="true"
+      :on-change="uploadByJsqd"
+      :file-list="fileList"
+      accept=".xlsx,.xls"
+    >
+      <i class="el-icon-upload" />
+      <div class="el-upload__text">
+        将文件拖到此处，或
+        <em>点击上传</em>
+      </div>
+      <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
+    </el-upload>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import crudMaterial from './material'
+import CRUD, { crud } from '@crud/crud'
+import { download2 } from '@/api/data'
+import { downloadFile } from '@/utils'
+
+export default {
+  name: 'UploadDialog',
+  mixins: [crud()],
+  components: {},
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      fileList: [],
+      file1: ''
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    is_one() {
+      this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
+    },
+    // 文件校验方法
+    beforeAvatarUpload(file) {
+      // 不能导入大小超过2Mb的文件
+      if (file.size > 10 * 1024 * 1024) {
+        return false
+      }
+      return true
+    },
+    // 文件发生改变就会触发的事件
+    uploadByJsqd(file) {
+      this.file1 = file
+    },
+    submit() {
+      if (this.beforeAvatarUpload(this.file1)) {
+        this.fileList.name = this.file1.name
+        this.fileList.url = ''
+        var formdata = new FormData()
+        formdata.append('file', this.file1.raw)
+        // excelImport：请求接口 formdata：传递参数
+        crudMaterial.excelImport(formdata).then((res) => {
+          this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.$emit('tableChanged3', '')
+          this.$emit('update:dialogShow', false)
+        }).catch(err => {
+
+          const list = err.response.data.message
+          download2('/api/produceWorkorder/download', list).then(result => {
+            downloadFile(result, '错误信息汇总', 'xlsx')
+            crud.downloadLoading = false
+          })
+        })
+      } else {
+        this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
+      }
+    }
+  }
+}
+</script>
+
diff --git a/nladmin-ui/src/views/wms/basedata/material/index.vue b/nladmin-ui/src/views/wms/basedata/material/index.vue
index 59d16c5..47b841c 100644
--- a/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -24,12 +24,12 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
-          icon="el-icon-refresh"
+          type="warning"
+          icon="el-icon-upload2"
           size="mini"
-          @click="materialSync"
+          @click="uploadShow = true"
         >
-          物料同步
+          导入
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -106,9 +106,6 @@
         <el-table-column prop="material_spec" label="物料规格" width="140" />
         <el-table-column prop="material_model" label="物料型号" />
         <el-table-column prop="class_name" label="物料分类" width="140" />
-        <el-table-column prop="unit_name" label="计量单位" />
-        <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
-        <el-table-column prop="product_series_name" label="系列" />
         <el-table-column label="启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
@@ -141,6 +138,7 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <UploadDialog :dialog-show.sync="uploadShow"/>
   </div>
 </template>
 
@@ -151,6 +149,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import UploadDialog from './UploadDialog'
 
 const defaultForm = {
   material_id: null,
@@ -190,7 +189,7 @@ export default {
   name: 'Materia',
   // 数据字典
   dicts: ['is_used'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -208,6 +207,7 @@ export default {
       classes2: [],
       classes3: [],
       fullscreenLoading: false,
+      uploadShow: false,
       measure_unit: [],
       productSeries: [],
       permission: {},
diff --git a/nladmin-ui/src/views/wms/basedata/material/material.js b/nladmin-ui/src/views/wms/basedata/material/material.js
index 8e57e4e..37c8a46 100644
--- a/nladmin-ui/src/views/wms/basedata/material/material.js
+++ b/nladmin-ui/src/views/wms/basedata/material/material.js
@@ -55,4 +55,11 @@ export function materialSync(data) {
   })
 }
 
-export default { add, edit, del, getMaterOptType, isAlongMaterType, getProductSeries, materialSync }
+export function excelImport(data) {
+  return request({
+    url: 'api/Materia/importExcel',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, excelImport, getMaterOptType, isAlongMaterType, getProductSeries, materialSync }
diff --git a/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue b/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
index f0064a8..50a7137 100644
--- a/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
+++ b/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
@@ -233,7 +233,8 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="form_type" min-width="120" :formatter="bill_typeFormat" label="单据类型" />
         <el-table-column show-overflow-tooltip prop="stor_name" min-width="120" label="仓库" />
-        <el-table-column prop="qty" label="物料数量" show-overflow-tooltip />
+        <el-table-column prop="qty" label="单据物料数量" show-overflow-tooltip />
+        <el-table-column prop="actual_qty" label="明细实际数量" show-overflow-tooltip width="120" />
         <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_code',crud.data,'物料编码')" />
         <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
@@ -247,8 +248,6 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column prop="actual_qty" label="明细实际数量" show-overflow-tooltip width="120" />
-        <el-table-column prop="total_qty" label="单据累计数量" show-overflow-tooltip width="130" />
         <el-table-column prop="remark" label="备注" show-overflow-tooltip width="120" />
         <el-table-column prop="create_name" label="创建人" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />