diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java
index 2ad8af16..ab9c1b69 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java
@@ -51,9 +51,9 @@ public class ClassstandardDto implements Serializable {
 
         private String create_time;
 
-        private String update_optid;
+        private String update_id;
 
-        private String update_optname;
+        private String update_name;
 
         private String update_time;
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java
index 50736c2f..8c5ab3c3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java
@@ -110,8 +110,8 @@ public class ClassstandardServiceImpl implements ClassstandardService {
         dto.setClass_id(IdUtil.getSnowflake(1, 1).nextId());
         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);
         dto.setIs_leaf("1");
@@ -156,8 +156,8 @@ public class ClassstandardServiceImpl implements ClassstandardService {
 
         String now = DateUtil.now();
         dto.setUpdate_time(now);
-        dto.setUpdate_optid(currentUserId);
-        dto.setUpdate_optname(nickName);
+        dto.setUpdate_id(currentUserId);
+        dto.setUpdate_name(nickName);
 
         WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls
index a578e75a..c3a522e9 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/impl/CachelinePositionServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/impl/CachelinePositionServiceImpl.java
index 9935946c..3459639f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/impl/CachelinePositionServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/impl/CachelinePositionServiceImpl.java
@@ -3,6 +3,7 @@ package org.nl.wms.cacheline.position.service.impl;
 import com.alibaba.fastjson.JSON;
 import lombok.RequiredArgsConstructor;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
@@ -12,6 +13,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.data.domain.Pageable;
+
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,10 +39,12 @@ public class CachelinePositionServiceImpl implements CachelinePositionService {
 
     @Override
     public Map<String,Object> queryAll(Map whereJson, Pageable page){
-        WQLObject wo = WQLObject.getWQLObject("sch_cacheline_position");
-        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "position_code");
-        final JSONObject json = rb.pageResult();
-        return json;
+        HashMap param = new HashMap();
+        param.put("search", whereJson.get("search"));
+        param.put("product_area", whereJson.get("product_area"));
+        param.put("flag", "1");
+        JSONObject jsonObject = WQL.getWO("CACHELINE_POSITION_QUERY").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "position_code");
+        return jsonObject;
     }
 
     @Override
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/wql/CACHELINE_POSITION_QUERY.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/wql/CACHELINE_POSITION_QUERY.wql
new file mode 100644
index 00000000..93fdd1cf
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/wql/CACHELINE_POSITION_QUERY.wql
@@ -0,0 +1,66 @@
+[交易说明]
+	交易名：	缓存位置
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.search					        TYPEAS s_string
+	输入.product_area					TYPEAS s_string
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		PAGEQUERY
+			SELECT
+            	cache.*
+            FROM
+            	sch_cacheline_position cache
+            WHERE
+                1 = 1
+                OPTION 输入.search <> ""
+                        (
+                        cache.position_code like "%" 输入.search "%"
+                        OR
+                        cache.position_name like "%" 输入.search "%"
+                        )
+                ENDOPTION
+                OPTION 输入.product_area <> ""
+                       cache.product_area = 输入.product_area
+                ENDOPTION
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
+
+
diff --git a/mes/qd/src/views/wms/cacheline/position/index.vue b/mes/qd/src/views/wms/cacheline/position/index.vue
index bd3d3124..2a34d66f 100644
--- a/mes/qd/src/views/wms/cacheline/position/index.vue
+++ b/mes/qd/src/views/wms/cacheline/position/index.vue
@@ -2,6 +2,40 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-width="90px"
+        label-suffix=":"
+      >
+        <el-form-item label="生产区域">
+          <el-select
+            v-model="query.product_area"
+            filterable
+            size="mini"
+            placeholder="区域类型"
+            class="filter-item"
+            @change="crud.toQuery()"
+          >
+            <el-option
+              v-for="item in dict.product_area"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模糊搜索">
+          <el-input
+            v-model="query.search"
+            clearable
+            size="small"
+            placeholder="请输入位置编码或名称"
+            class="filter-item"
+          />
+        </el-form-item>
+        <rrOperation :crud="crud" />
+      </el-form>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
@@ -177,7 +211,10 @@ export default {
       url: 'api/cachelinePosition',
       idField: 'position_code',
       sort: 'position_code,desc',
-      crudMethod: { ...crudCachelinePosition }
+      crudMethod: { ...crudCachelinePosition },
+      query: {
+        product_area: 'A1'
+      }
     })
   },
   data() {