opt:用户仓库权限、用户区域权限查询条件添加，用户区域权限包名修改

lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/ivt/service/impl/StPointIvtServiceImpl.java

@@ -18,7 +18,7 @@ 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.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/TaskServiceImpl.java

@@ -26,7 +26,7 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.basedata.master.classstandard.service.IClassStandardService;
 import org.nl.wms.basedata.master.classstandard.service.dao.ClassStandard;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/userarea/controller/UserAreaPermissionController.java

@@ -1,11 +1,11 @@
-package org.nl.wms.basedata.st.areapermissions.controller;
+package org.nl.wms.basedata.st.userarea.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/userarea/package-info.java

@@ -2,4 +2,4 @@
  * 区域权限管理相关内容
  * 基础的三层逻辑
  */
-package org.nl.wms.basedata.st.areapermissions;
+package org.nl.wms.basedata.st.userarea;

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/userarea/service/IUserAreaPermissionService.java

@@ -1,14 +1,11 @@
-package org.nl.wms.basedata.st.areapermissions.service;
+package org.nl.wms.basedata.st.userarea.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.system.service.user.dao.SysUser;
+import org.nl.wms.basedata.st.userarea.service.dao.UserAreaPermission;
-import org.nl.wms.basedata.st.areapermissions.service.dao.UserAreaPermission;
+import org.nl.wms.basedata.st.userarea.service.vo.UsersVo;
-import org.nl.wms.basedata.st.areapermissions.service.vo.UsersVo;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Map;

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/userarea/service/dao/UserAreaPermission.java

@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.st.areapermissions.service.dao;
+package org.nl.wms.basedata.st.userarea.service.dao;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/userarea/service/dao/mapper/UserAreaPermissionMapper.java

@@ -1,9 +1,9 @@
-package org.nl.wms.basedata.st.areapermissions.service.dao.mapper;
+package org.nl.wms.basedata.st.userarea.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.wms.basedata.st.areapermissions.service.dao.UserAreaPermission;
+import org.nl.wms.basedata.st.userarea.service.dao.UserAreaPermission;
-import org.nl.wms.basedata.st.areapermissions.service.vo.UsersVo;
+import org.nl.wms.basedata.st.userarea.service.vo.UsersVo;
 
 /**
  * @Author: lyd

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/userarea/service/dao/mapper/UserAreaPermissionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.basedata.st.areapermissions.service.dao.mapper.UserAreaPermissionMapper">
 
-    <select id="selectPageLeftJoin" resultType="org.nl.wms.basedata.st.areapermissions.service.vo.UsersVo">
+    <select id="selectPageLeftJoin" resultType="org.nl.wms.basedata.st.userarea.service.vo.UsersVo">
         SELECT
         sys_user.*,
         dept.name

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/userarea/service/impl/UserAreaPermissionServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.st.areapermissions.service.impl;
+package org.nl.wms.basedata.st.userarea.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -11,14 +11,13 @@ 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.core.bean.WQLObject;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
-import org.nl.wms.basedata.st.areapermissions.service.dao.UserAreaPermission;
+import org.nl.wms.basedata.st.userarea.service.dao.UserAreaPermission;
-import org.nl.wms.basedata.st.areapermissions.service.dao.mapper.UserAreaPermissionMapper;
+import org.nl.wms.basedata.st.userarea.service.dao.mapper.UserAreaPermissionMapper;
-import org.nl.wms.basedata.st.areapermissions.service.vo.UsersVo;
+import org.nl.wms.basedata.st.userarea.service.vo.UsersVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -71,30 +70,28 @@ public class UserAreaPermissionServiceImpl extends ServiceImpl<UserAreaPermissio
     }
 
     public String getInArea() {
-        String currentUserId = SecurityUtils.getCurrentUserId().toString();
+        String currentUserId = SecurityUtils.getCurrentUserId();
-        WQLObject userStorTab = WQLObject.getWQLObject("st_ivt_userarea");
+        List<UserAreaPermission> userStorArr = userAreaPermissionMapper.selectList(new LambdaQueryWrapper<UserAreaPermission>()
-
+                .eq(UserAreaPermission::getUser_id, currentUserId));
-        JSONArray userStorArr = userStorTab.query("user_id = '" + currentUserId + "'").getResultJSONArray(0);
-        int size = userStorArr.size();
         // 将仓库id拼成字符串
         String in_stor_id = "";
-
+        int size = userStorArr.size();
         for (int i = 0; i < userStorArr.size(); i++) {
-            JSONObject json = userStorArr.getJSONObject(i);
+            UserAreaPermission json = userStorArr.get(i);
 
             if (size == 1) {
                 // 如果只有一条记录
-                in_stor_id = "('" + json.getString("product_area") + "')";
+                in_stor_id = "('" + json.getProduct_area() + "')";
             } else {
                 if (i == 0) {
                     // 第一条记录拼接
-                    in_stor_id = "('" + json.getString("product_area") + "','";
+                    in_stor_id = "('" + json.getProduct_area()+ "','";
                 } else {
                     if ((size - 1) == i) {
                         // 最后一条记录拼接
-                        in_stor_id += json.getString("product_area") + "')";
+                        in_stor_id += json.getProduct_area() + "')";
                     } else {
-                        in_stor_id += json.getString("product_area") + "','";
+                        in_stor_id += json.getProduct_area() + "','";
                     }
                 }
             }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/userarea/service/vo/UsersVo.java

@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.st.areapermissions.service.vo;
+package org.nl.wms.basedata.st.userarea.service.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/userstor/service/dao/mapper/UserStorMapper.xml

@@ -10,7 +10,7 @@
         <where>
             sys_user.is_used = '1'
             <if test="blurry != null">
-                and (username like #{blurry} or person_name like #{blurry})
+                and (username like CONCAT('%', #{blurry}, '%')  or person_name like CONCAT('%', #{blurry}, '%') )
             </if>
         </where>
         order by username desc

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 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 lombok.RequiredArgsConstructor;
@@ -17,7 +16,7 @@ import org.nl.common.utils.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
 import org.nl.wms.pda.mps.service.BakingService;

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java

@@ -17,7 +17,7 @@ import org.nl.wms.basedata.master.interfaceback.service.dao.InterfaceBack;
 import org.nl.wms.basedata.master.interfaceback.service.dao.mapper.InterfaceBackMapper;
 import org.nl.wms.basedata.master.storagevehicleinfo.service.StoragevehicleinfoService;
 import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleinfo;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
 import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.nl.wms.pda.mps.service.CasingService;

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.content.HttpContext;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.basedata.master.unit.service.dao.Unit;
 import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 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.ext.acs.service.WmsToAcsService;

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java

@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pda.mps.service.InService;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.tasks.CutConveyorTask;

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java

@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pda.mps.service.OutService;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.tasks.CutConveyorTask;

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PaperTubeServiceImpl.java

@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.pda.mps.service.PaperTubeService;
 import org.springframework.beans.factory.annotation.Autowired;

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java

@@ -14,7 +14,7 @@ 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.core.content.HttpContext;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
 import org.nl.wms.pda.mps.service.RawFoilService;

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java

@@ -12,7 +12,7 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.basedata.master.interfaceback.service.dao.InterfaceBack;
 import org.nl.wms.basedata.master.interfaceback.service.dao.mapper.InterfaceBackMapper;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pda.mps.service.ShippingService;
 import org.nl.wms.sch.tasks.CutConveyorTask;
 import org.springframework.beans.factory.annotation.Autowired;

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java

@@ -12,7 +12,7 @@ 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.core.content.HttpContext;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pda.st.service.CoolInService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java

@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pda.st.service.CoolOutService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java

@@ -11,7 +11,7 @@ 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.SpringContextHolder;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.pda.task.service.PdaTaskService;
 import org.nl.b_lms.sch.task.service.TaskService;

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java

@@ -21,7 +21,7 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.basedata.master.interfaceback.service.dao.InterfaceBack;
 import org.nl.wms.basedata.master.interfaceback.service.dao.mapper.InterfaceBackMapper;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.nl.wms.pdm.ivt.service.CoolPointIvtService;
 import org.nl.wms.pdm.ivt.service.dto.CoolPointIvtDto;

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java

@@ -14,7 +14,7 @@ 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.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pdm.ivt.service.CutPointIvtService;
 import org.nl.wms.pdm.ivt.service.dto.CutPointIvtDto;
 import org.springframework.beans.factory.annotation.Autowired;

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java

@@ -14,7 +14,7 @@ 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.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pdm.ivt.service.DeliveryPointIvtService;
 import org.nl.wms.pdm.ivt.service.dto.DeliveryPointIvtDto;
 import org.springframework.beans.factory.annotation.Autowired;

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java

@@ -21,7 +21,7 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.basedata.master.interfaceback.service.dao.InterfaceBack;
 import org.nl.wms.basedata.master.interfaceback.service.dao.mapper.InterfaceBackMapper;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.nl.wms.pdm.ivt.service.HotPointIvtService;
 import org.nl.wms.pdm.ivt.service.dto.HotPointIvtDto;

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java

@@ -14,7 +14,7 @@ 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.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pdm.ivt.service.PackagePointIvtService;
 import org.nl.wms.pdm.ivt.service.dto.PackagePointIvtDto;
 import org.springframework.beans.factory.annotation.Autowired;

lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java

@@ -14,7 +14,7 @@ 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.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pdm.ivt.service.SbPointIvtService;
 import org.nl.wms.pdm.ivt.service.dto.SbPointIvtDto;
 import org.springframework.beans.factory.annotation.Autowired;

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java

@@ -15,7 +15,7 @@ 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.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.pdm.service.RawfoilworkorderService;
 import org.nl.wms.pdm.service.dto.RawfoilworkorderDto;
 import org.springframework.beans.factory.annotation.Autowired;

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.basedata.master.interfaceback.service.dao.InterfaceBack;
 import org.nl.wms.basedata.master.interfaceback.service.dao.mapper.InterfaceBackMapper;
-import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService;
+import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService;
 import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.nl.wms.pdm.service.SlittingproductionplanService;
 import org.nl.wms.pdm.service.dto.SlittingproductionplanDto;

lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue

@@ -2,18 +2,26 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <div v-if="crud.props.searchToggle">
+      <div>
         <!-- 搜索 -->
-        <el-input
+        <el-form
-          v-model="query.blurry"
+          :inline="true"
-          size="mini"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          placeholder="输入名称或者描述搜索"
+          label-width="80px"
-          style="width: 200px;"
+          label-suffix=":">
-          class="filter-item"
+          <el-form-item label="单据状态">
-          @keyup.enter.native="crud.toQuery"
+            <el-input
-        />
+              v-model="query.blurry"
-        <rrOperation />
+              size="mini"
+              clearable
+              placeholder="输入名称或者描述搜索"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation/>
+        </el-form>
       </div>
     </div>
     <!-- 表单渲染 -->

lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue

@@ -2,18 +2,26 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <div v-if="crud.props.searchToggle">
+      <div>
         <!-- 搜索 -->
-        <el-input
+        <el-form
-          v-model="query.blurry"
+          :inline="true"
-          size="mini"
+           class="demo-form-inline"
-          clearable
+           label-position="right"
-          placeholder="输入名称或者描述搜索"
+           label-width="80px"
-          style="width: 200px;"
+           label-suffix=":">
-          class="filter-item"
+        <el-form-item label="单据状态">
-          @keyup.enter.native="crud.toQuery"
+          <el-input
-        />
+            v-model="query.blurry"
+            size="mini"
+            clearable
+            placeholder="输入名称或者描述搜索"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+        </el-form-item>
         <rrOperation/>
+        </el-form>
       </div>
     </div>
     <!-- 表单渲染 -->

lms/nladmin-ui/src/views/wms/st/inStor/moveStor/index.vue

@@ -99,8 +99,8 @@
                 :value="item.value"
               />
             </el-select>
-
+          </el-form-item>
-            <el-form-item label="创建时间">
+          <el-form-item label="创建时间">
               <el-date-picker
                 v-model="query.createTime"
                 type="daterange"
@@ -111,7 +111,6 @@
                 @change="crud.toQuery"
               />
             </el-form-item>
-          </el-form-item>
           <rrOperation />
         </el-form>
       </div>