From 5215e0f047b21eabce045798bca4afbcfd07a813 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Wed, 11 Sep 2024 15:21:23 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BB=93=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StructattrServiceImpl.java   |  4 +-
 .../views/wms/basedata/st/struct/index.vue    | 41 ++++++++++++++-----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
index 51cbe4bfd..85882e524 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
@@ -81,12 +81,12 @@ public class StructattrServiceImpl implements StructattrService {
         map.put("is_used", (String) whereJson.get("is_used"));
         map.put("is_have", (String) whereJson.get("is_have"));
 
-        // 如果是二期仓库则将层数删除
+      /*  // 如果是二期仓库则将层数删除
         if (ObjectUtil.isNotEmpty(whereJson.get("stor_id"))) {
             if ( whereJson.get("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
                 map.put("layer_num", "");
             }
-        }
+        }*/
         //获取人员对应的仓库
         UserStorServiceImpl userStorService = new UserStorServiceImpl();
         String in_stor_id = userStorService.getInStor();
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
index c8c09a2e7..8d8fbf59d 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
@@ -331,16 +331,8 @@
             {{ dict.label.placement_type[scope.row.placement_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="zdepth" label="深度" min-width="120" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ dict.label.zdepth[scope.row.zdepth] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="storagevehicle_type" label="托盘类型" min-width="120" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ dict.label.storagevehicle_type[scope.row.storagevehicle_type] }}
-          </template>
-        </el-table-column>
+        <el-table-column prop="zdepth" label="深度" min-width="120" show-overflow-tooltip :formatter="zdepthType" />
+        <el-table-column prop="storagevehicle_type" label="托盘类型" min-width="120" show-overflow-tooltip :formatter="formattTwo" />
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
@@ -472,7 +464,15 @@ export default {
       layerList: [
         { 'label': '1层', 'value': '1' },
         { 'label': '2层', 'value': '2' },
-        { 'label': '3层', 'value': '3' }
+        { 'label': '3层', 'value': '3' },
+        { 'label': '4层', 'value': '4' },
+        { 'label': '5层', 'value': '5' },
+        { 'label': '6层', 'value': '6' },
+        { 'label': '7层', 'value': '7' },
+        { 'label': '8层', 'value': '8' },
+        { 'label': '9层', 'value': '9' },
+        { 'label': '10层', 'value': '10' },
+        { 'label': '11层', 'value': '11' }
       ],
       isHaveList: [
         { 'label': '空位', 'value': '1' },
@@ -626,6 +626,25 @@ export default {
         this.dialogVisible2 = false
         this.crud.toQuery()
       })
+    },
+    zdepthType(row) {
+      if (row.zdepth === '1') {
+        return '浅货位'
+      }
+      if (row.zdepth === '2') {
+        return '深货位'
+      }
+      if (row.zdepth === '3') {
+        return '无'
+      }
+    },
+    formattTwo(row) {
+      if (row.storagevehicle_type === '1') {
+        return '小托盘'
+      }
+      if (row.storagevehicle_type === '2') {
+        return '大托盘'
+      }
     }
   }
 }