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 3459639f..4289b2bc 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 @@ -43,7 +43,9 @@ public class CachelinePositionServiceImpl implements CachelinePositionService { 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"); + JSONObject jsonObject = WQL.getWO("CACHELINE_POSITION_QUERY") + .addParamMap(param) + .pageQuery(WqlUtil.getHttpContext(page), "cacheLine_code, cache_line_no, layer_num, positionorder_no"); return jsonObject; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 17b8d79f..71c1cffb 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index 0aace1f1..61298ba4 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ diff --git a/mes/qd/src/views/wms/cacheline/position/index.vue b/mes/qd/src/views/wms/cacheline/position/index.vue index 7afff139..01b4919c 100644 --- a/mes/qd/src/views/wms/cacheline/position/index.vue +++ b/mes/qd/src/views/wms/cacheline/position/index.vue @@ -69,6 +69,9 @@ + + + @@ -150,17 +153,30 @@ - - + + + - - - + + + + + + + + +