diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java
index bd591fd..d5b986e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java
@@ -2,37 +2,24 @@ package org.nl.b_lms.sch.tasks;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
-import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis;
-import org.nl.b_lms.storage_manage.ios.service.iostorInv.impl.StIvtIostorinvServiceImpl;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.impl.StIvtIostorinvdisServiceImpl;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
-import org.nl.wms.basedata.master.structattr.service.impl.StructattrServiceImpl;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
-import org.nl.wms.st.inbill.service.impl.InbillServiceImpl;
-import org.nl.wms.st.inbill.service.impl.RawAssistIStorServiceImpl;
-import org.nl.wms.st.inbill.service.impl.StorPublicServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index 64896ec..2f80108 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -36,8 +36,8 @@ import org.nl.common.utils.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.system.service.param.ISysParamService;
-import org.nl.wms.basedata.master.storattr.service.StorattrService;
-import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
+import org.nl.wms.basedata.st.storattr.service.StorattrService;
+import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.util.TranUtil;
@@ -49,7 +49,6 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
index 5aeb8e1..6969b95 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
@@ -3,7 +3,6 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 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;
@@ -16,10 +15,7 @@ import com.github.pagehelper.PageHelper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
-import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.mapper.PdmBiSlittingproductionplanMapper;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
-import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper;
 import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
 import org.nl.b_lms.pdm_manage.enums.SUBEnum;
 import org.nl.b_lms.sch.tasks.TwoInTask;
@@ -43,14 +39,13 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.system.service.param.impl.SysParamServiceImpl;
-import org.nl.wms.basedata.master.storattr.service.StorattrService;
-import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
+import org.nl.wms.basedata.st.storattr.service.StorattrService;
+import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
 import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.service.PointService;
 import org.nl.wms.sch.service.dto.PointDto;
-import org.nl.wms.sch.tasks.InTask;
 import org.nl.wms.st.inbill.service.StorPublicService;
 import org.nl.wms.st.returns.service.impl.InAndOutRetrunServiceImpl;
 import org.redisson.api.RLock;
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/SendRegionWebSocketServer.java b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/SendRegionWebSocketServer.java
index c845452..79d4d12 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/SendRegionWebSocketServer.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/SendRegionWebSocketServer.java
@@ -20,9 +20,8 @@ import com.alibaba.fastjson.JSONArray;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.utils.RedissonUtils;
-import org.nl.modules.mnt.service.AutoRiKuService;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.basedata.master.structattr.service.StructattrService;
+import org.nl.wms.basedata.st.structattr.service.StructattrService;
 import org.springframework.stereotype.Component;
 
 import javax.websocket.*;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/controller/SectattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/controller/SectattrController.java
similarity index 90%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/controller/SectattrController.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/controller/SectattrController.java
index b7e934c..9d62e56 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/controller/SectattrController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/controller/SectattrController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.sectattr.controller;
+package org.nl.wms.basedata.st.sectattr.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -6,9 +6,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
-import org.nl.wms.basedata.master.sectattr.service.SectattrService;
-import org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto;
-import org.springframework.data.domain.Pageable;
+import org.nl.wms.basedata.st.sectattr.service.SectattrService;
+import org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/SectattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/SectattrService.java
similarity index 84%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/SectattrService.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/SectattrService.java
index 1e6caf9..37932ec 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/SectattrService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/SectattrService.java
@@ -1,12 +1,10 @@
-package org.nl.wms.basedata.master.sectattr.service;
+package org.nl.wms.basedata.st.sectattr.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.basedata.master.sectattr.service.dao.Sectattr;
-import org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto;
-import org.springframework.data.domain.Pageable;
+import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
+import org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/Sectattr.java
similarity index 96%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/Sectattr.java
index ca41490..041d0e5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/Sectattr.java
@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.sectattr.service.dao;
+package org.nl.wms.basedata.st.sectattr.service.dao;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/mapper/SectattrMapper.java
similarity index 58%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/mapper/SectattrMapper.java
index b9c3e67..7435b1a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/mapper/SectattrMapper.java
@@ -1,16 +1,10 @@
-package org.nl.wms.basedata.master.sectattr.service.dao.mapper;
+package org.nl.wms.basedata.st.sectattr.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.modules.common.annotation.Query;
-import org.nl.wms.basedata.master.sectattr.service.dao.Sectattr;
-import org.springframework.data.domain.Pageable;
-
-import java.util.HashMap;
-import java.util.List;
+import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
 
 /**
  * @author LENOVO
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/mapper/SectattrMapper.xml
similarity index 84%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.xml
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/mapper/SectattrMapper.xml
index e35e3fd..5089fee 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/mapper/SectattrMapper.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.basedata.master.sectattr.service.dao.mapper.SectattrMapper">
+<mapper namespace="org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper">
 
-    <select id="queryAll" resultType="org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto">
+    <select id="queryAll" resultType="org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto">
         select
         sect.*,
         stor.stor_name
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dto/SectattrDto.java
similarity index 96%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dto/SectattrDto.java
index 80e41de..0d067fc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dto/SectattrDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.sectattr.service.dto;
+package org.nl.wms.basedata.st.sectattr.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/impl/SectattrServiceImpl.java
similarity index 92%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/impl/SectattrServiceImpl.java
index d68f0a1..c3565a5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/impl/SectattrServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.sectattr.service.impl;
+package org.nl.wms.basedata.st.sectattr.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -6,10 +6,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 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.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,25 +19,19 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.modules.wql.util.WqlUtil;
-import org.nl.system.service.logicflow.dao.StageImage;
-import org.nl.wms.basedata.master.sectattr.service.dao.Sectattr;
-import org.nl.wms.basedata.master.sectattr.service.dao.mapper.SectattrMapper;
-import org.nl.wms.basedata.master.sectattr.service.SectattrService;
-import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
-import org.nl.wms.basedata.master.structattr.service.StructattrService;
-import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
-import org.nl.wms.basedata.master.structattr.service.impl.StructattrServiceImpl;
-import org.nl.wms.basedata.master.storattr.service.StorattrService;
-import org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto;
-import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
+import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
+import org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper;
+import org.nl.wms.basedata.st.sectattr.service.SectattrService;
+import org.nl.wms.basedata.st.structattr.service.StructattrService;
+import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
+import org.nl.wms.basedata.st.storattr.service.StorattrService;
+import org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto;
+import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
 import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/controller/StorattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/controller/StorattrController.java
similarity index 86%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/controller/StorattrController.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/controller/StorattrController.java
index 3b97ed4..85d7378 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/controller/StorattrController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/controller/StorattrController.java
@@ -1,15 +1,13 @@
-package org.nl.wms.basedata.master.storattr.controller;
+package org.nl.wms.basedata.st.storattr.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
-import org.nl.wms.basedata.master.storattr.service.StorattrService;
-import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
-import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
-import org.springframework.data.domain.Pageable;
+import org.nl.wms.basedata.st.storattr.service.StorattrService;
+import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
+import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/StorattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/StorattrService.java
similarity index 85%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/StorattrService.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/StorattrService.java
index 5c7dba3..efe0152 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/StorattrService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/StorattrService.java
@@ -1,11 +1,10 @@
-package org.nl.wms.basedata.master.storattr.service;
+package org.nl.wms.basedata.st.storattr.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
-import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
-import org.springframework.data.domain.Pageable;
+import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
+import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/Storattr.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/Storattr.java
similarity index 95%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/Storattr.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/Storattr.java
index aa83531..d855bbe 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/Storattr.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/Storattr.java
@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.storattr.service.dao;
+package org.nl.wms.basedata.st.storattr.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @author zhouz
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/mapper/StorattrMapper.java
similarity index 51%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/mapper/StorattrMapper.java
index c28441f..acabb1a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/mapper/StorattrMapper.java
@@ -1,15 +1,9 @@
-package org.nl.wms.basedata.master.storattr.service.dao.mapper;
+package org.nl.wms.basedata.st.storattr.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
-import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
-import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
-import org.springframework.data.domain.Pageable;
-
-import java.util.HashMap;
-import java.util.List;
+import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
 
 public interface StorattrMapper extends BaseMapper<Storattr> {
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/mapper/StorattrMapper.xml
similarity index 71%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.xml
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/mapper/StorattrMapper.xml
index d39e5c1..d097fdf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/mapper/StorattrMapper.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.basedata.master.storattr.service.dao.mapper.StorattrMapper">
+<mapper namespace="org.nl.wms.basedata.st.storattr.service.dao.mapper.StorattrMapper">
 
-    <select id="queryAll" resultType="org.nl.wms.basedata.master.storattr.service.dao.Storattr">
+    <select id="queryAll" resultType="org.nl.wms.basedata.st.storattr.service.dao.Storattr">
         SELECT stor.*
         FROM st_ivt_bsrealstorattr stor
         <where>
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dto/StorattrDto.java
similarity index 94%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dto/StorattrDto.java
index e261db1..8fea8d1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dto/StorattrDto.java
@@ -1,11 +1,10 @@
-package org.nl.wms.basedata.master.storattr.service.dto;
+package org.nl.wms.basedata.st.storattr.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @author zhouz
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/impl/StorattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/impl/StorattrServiceImpl.java
similarity index 90%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/impl/StorattrServiceImpl.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/impl/StorattrServiceImpl.java
index 54e7422..13ee882 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/impl/StorattrServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/impl/StorattrServiceImpl.java
@@ -1,12 +1,9 @@
-package org.nl.wms.basedata.master.storattr.service.impl;
+package org.nl.wms.basedata.st.storattr.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
-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.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -18,20 +15,15 @@ import net.dreamlu.mica.core.utils.BeanUtil;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.wql.WQL;
-import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
-import org.nl.wms.basedata.master.sectattr.service.SectattrService;
-import org.nl.wms.basedata.master.sectattr.service.dao.Sectattr;
-import org.nl.wms.basedata.master.storattr.service.StorattrService;
-import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
-import org.nl.wms.basedata.master.storattr.service.dao.mapper.StorattrMapper;
-import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
-import org.nl.wms.basedata.master.structattr.service.StructattrService;
-import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
+import org.nl.wms.basedata.st.sectattr.service.SectattrService;
+import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
+import org.nl.wms.basedata.st.storattr.service.StorattrService;
+import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
+import org.nl.wms.basedata.st.storattr.service.dao.mapper.StorattrMapper;
+import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
+import org.nl.wms.basedata.st.structattr.service.StructattrService;
+import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/controller/StructattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/controller/StructattrController.java
similarity index 95%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/controller/StructattrController.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/controller/StructattrController.java
index ef90012..46654fc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/controller/StructattrController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/controller/StructattrController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.structattr.controller;
+package org.nl.wms.basedata.st.structattr.controller;
 
 
 import com.alibaba.fastjson.JSONArray;
@@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
-import org.nl.wms.basedata.master.structattr.service.StructattrService;
-import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
+import org.nl.wms.basedata.st.structattr.service.StructattrService;
+import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/StructattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/StructattrService.java
similarity index 94%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/StructattrService.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/StructattrService.java
index 3f3ccf8..430af58 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/StructattrService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/StructattrService.java
@@ -1,12 +1,12 @@
-package org.nl.wms.basedata.master.structattr.service;
+package org.nl.wms.basedata.st.structattr.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.master.structattr.service.dao.Structattr;
-import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
+import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
+import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/Structattr.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/Structattr.java
similarity index 98%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/Structattr.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/Structattr.java
index 8c09d10..242a3f1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/Structattr.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/Structattr.java
@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.structattr.service.dao;
+package org.nl.wms.basedata.st.structattr.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/mapper/StructattrMapper.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/mapper/StructattrMapper.java
similarity index 82%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/mapper/StructattrMapper.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/mapper/StructattrMapper.java
index 5ade137..82c0526 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/mapper/StructattrMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/mapper/StructattrMapper.java
@@ -1,10 +1,10 @@
-package org.nl.wms.basedata.master.structattr.service.dao.mapper;
+package org.nl.wms.basedata.st.structattr.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
+import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
 
 import java.util.List;
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/mapper/StructattrMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/mapper/StructattrMapper.xml
similarity index 94%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/mapper/StructattrMapper.xml
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/mapper/StructattrMapper.xml
index 71abb49..3f282f6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/mapper/StructattrMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/mapper/StructattrMapper.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.basedata.master.structattr.service.dao.mapper.StructattrMapper">
+<mapper namespace="org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper">
 
     <select id="getPrefix" resultType="com.alibaba.fastjson.JSONObject">
         select *
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dto/StructattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dto/StructattrDto.java
similarity index 98%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dto/StructattrDto.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dto/StructattrDto.java
index 0aeb2d7..b8dbd25 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dto/StructattrDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dto/StructattrDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.structattr.service.dto;
+package org.nl.wms.basedata.st.structattr.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java
similarity index 97%
rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/impl/StructattrServiceImpl.java
rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java
index 4a8bce1..b8a63a0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/impl/StructattrServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java
@@ -1,6 +1,4 @@
-package org.nl.wms.basedata.master.structattr.service.impl;
-
-import com.google.common.collect.Maps;
+package org.nl.wms.basedata.st.structattr.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
@@ -10,7 +8,6 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdUtil;
 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;
@@ -26,21 +23,19 @@ import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound;
 import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.basedata.master.sectattr.service.dao.Sectattr;
-import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
-import org.nl.wms.basedata.master.structattr.service.dao.mapper.StructattrMapper;
-import org.nl.wms.basedata.master.sectattr.service.SectattrService;
-import org.nl.wms.basedata.master.storattr.service.StorattrService;
-import org.nl.wms.basedata.master.structattr.service.StructattrService;
-import org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto;
-import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
-import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
+import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
+import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
+import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
+import org.nl.wms.basedata.st.sectattr.service.SectattrService;
+import org.nl.wms.basedata.st.storattr.service.StorattrService;
+import org.nl.wms.basedata.st.structattr.service.StructattrService;
+import org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto;
+import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
+import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
 import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
index 0075078..ed635c9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
@@ -10,8 +10,8 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
-import org.nl.wms.basedata.master.structattr.service.impl.StructattrServiceImpl;
+import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
+import org.nl.wms.basedata.st.structattr.service.impl.StructattrServiceImpl;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
index 351f913..3178040 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
@@ -20,11 +20,11 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.system.service.param.impl.SysParamServiceImpl;
-import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
-import org.nl.wms.basedata.master.storattr.service.StorattrService;
-import org.nl.wms.basedata.master.structattr.service.StructattrService;
-import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
-import org.nl.wms.basedata.master.structattr.service.impl.StructattrServiceImpl;
+import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
+import org.nl.wms.basedata.st.storattr.service.StorattrService;
+import org.nl.wms.basedata.st.structattr.service.StructattrService;
+import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
+import org.nl.wms.basedata.st.structattr.service.impl.StructattrServiceImpl;
 import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
 import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -812,7 +812,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
         if (dis_rows.size() <= 0) {
             throw new BadRequestException("数据参数有误！");
         }
-        org.nl.wms.basedata.master.structattr.service.dto.StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code"));
+        org.nl.wms.basedata.st.structattr.service.dto.StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code"));
         JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dis_rows.getJSONObject(0).getString("iostorinv_id") + "'").uniqueResult(0);
         for (int i = 0; i < dis_rows.size(); i++) {
             JSONObject i_form = new JSONObject();
@@ -2338,7 +2338,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             task_wql.update(task_map, "taskdtl_id = '" + whereJson.get("task_id") + "'");
 
             //更新分配表的目的仓位
-            org.nl.wms.basedata.master.structattr.service.dto.StructattrDto structattrDto = structattrService.findByCode((String) whereJson.get("new_struct_code"));
+            org.nl.wms.basedata.st.structattr.service.dto.StructattrDto structattrDto = structattrService.findByCode((String) whereJson.get("new_struct_code"));
             HashMap str_map = new HashMap<>();
             str_map.put("sect_id", structattrDto.getSect_id());
             str_map.put("sect_code", structattrDto.getSect_code());
@@ -2365,7 +2365,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             if (dis_rows.size() <= 0) {
                 throw new BadRequestException("数据参数有误！");
             }
-            org.nl.wms.basedata.master.structattr.service.dto.StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code"));
+            org.nl.wms.basedata.st.structattr.service.dto.StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code"));
             JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dis_rows.getJSONObject(0).getString("iostorinv_id") + "'").uniqueResult(0);
             for (int i = 0; i < dis_rows.size(); i++) {
                 JSONObject i_form = new JSONObject();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java
index 8d33de8..aa5aabd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java
@@ -23,8 +23,8 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
-import org.nl.wms.basedata.master.structattr.service.dao.mapper.StructattrMapper;
+import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
+import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
 import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
 import org.nl.wms.sch.manage.TaskStatusEnum;