fix: 修复缓存线位置展示

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;
     }
 

mes/qd/src/views/wms/cacheline/position/index.vue

@@ -69,6 +69,9 @@
           <el-form-item label="位置顺序号" prop="positionOrder_no">
             <el-input v-model="form.positionOrder_no" style="width: 200px;" />
           </el-form-item>
+          <el-form-item label="缓存线编号" prop="cache_line_no">
+            <el-input v-model="form.cache_line_no" style="width: 200px;" />
+          </el-form-item>
           <el-form-item label="缓存线编码" prop="cacheline_code">
             <el-input v-model="form.cacheline_code" style="width: 200px;" />
           </el-form-item>
@@ -150,17 +153,30 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="position_code" label="位置编码" width="120"/>
-        <el-table-column prop="position_name" label="名字" width="120"/>
-        <el-table-column prop="positionOrder_no" label="顺序号" />
         <el-table-column prop="cacheline_code" label="缓存线编码" />
+        <el-table-column prop="position_name" label="名字" width="120"/>
+        <el-table-column prop="cache_line_no" label="缓存线编号" />
         <el-table-column prop="layer_num" label="层数" />
+        <el-table-column prop="positionorder_no" label="顺序号" />
         <el-table-column prop="priority_layer_no" label="优先层顺序" />
         <el-table-column prop="order_no" label="料箱展示顺序号" width="120"/>
         <el-table-column prop="vehicle_code" label="载具编码" />
         <el-table-column prop="product_area" label="生产区域" />
-        <el-table-column prop="is_empty" label="是否空位" />
+        <el-table-column prop="is_empty" label="是否空位">
-        <el-table-column prop="is_show" label="是否展示" />
+          <template slot-scope="scop">
-        <el-table-column prop="is_active" label="是否可用" />
+            {{ scop.row.is_empty == 1 ? "是" : "否" }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_show" label="是否展示">
+          <template slot-scope="scop">
+            {{ scop.row.is_show == 1 ? "是" : "否" }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_active" label="是否可用">
+          <template slot-scope="scop">
+            {{ scop.row.is_active == 1 ? "是" : "否" }}
+          </template>
+        </el-table-column>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation