From 4c376ee70bbcb63e5177d4df82933abc44d6e6a1 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 4 Nov 2024 16:09:44 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=9C=A8=E7=AE=B1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=A2=9E=E5=8A=A0=E6=9C=A8=E7=AE=B1=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../database/service/dao/MdpbBoxtype.java     |  5 +++-
 .../util/impl/LashManageServiceImpl.java      |  6 +++-
 .../views/wms/basedata/st/boxType/index.vue   | 28 +++++++++++++++++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java
index 40c04a156..fab541a8e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java
@@ -65,5 +65,8 @@ public class MdpbBoxtype implements Serializable {
      */
     private String expend_width;
 
-
+    /**
+     * 箱体结构
+     */
+    private String box_structure;
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
index eb35762ac..435efc23e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
@@ -371,7 +371,11 @@ public class LashManageServiceImpl implements LashManageService {
             throw new BadRequestException("第一次捆扎数量不能为空!");
         }
         result.put("bundleTimes", boxTypeDao.getLash_num_one());
-
+        // 木箱结构
+        if (ObjectUtil.isEmpty(boxTypeDao.getBox_structure())) {
+            throw new BadRequestException("木箱结构不能为空!");
+        }
+        result.put("box_structure", boxTypeDao.getBox_structure());
         return result;
     }
 
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue
index 5b5268dc1..3b1014dca 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue
@@ -90,6 +90,26 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="箱体结构:" prop="box_structure">
+                <el-select
+                  size="mini"
+                  v-model="form.box_structure"
+                  placeholder="全部"
+                  class="filter-item"
+                  @change="crud.toQuery"
+                >
+                  <el-option
+                    v-for="item in dict.BOX_STRUCTURE"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="是否一次捆扎:" prop="need_lash_one">
@@ -160,6 +180,7 @@
         <el-table-column prop="need_lash_one" label="是否一次捆扎" width="150" :formatter="formatOne" />
         <el-table-column prop="need_lash_two" label="是否二次捆扎" width="150" :formatter="formatTwo" />
         <el-table-column prop="expend_width" label="叉车取货宽度" width="150" />
+        <el-table-column prop="box_structure" label="箱体结构" width="150" :formatter="boxType"/>
         <el-table-column
           v-permission="['admin','sectattr:edit','sectattr:del']"
           label="操作"
@@ -197,11 +218,11 @@ const defaultForm = {
   lash_num_tow: null,
   need_lash_one: '0',
   need_lash_two: '0',
-  expend_width: null
+  box_structure: null
 }
 export default {
   name: 'BoxType',
-  dicts: ['IS_OR_NOT'],
+  dicts: ['IS_OR_NOT', 'BOX_STRUCTURE'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -245,6 +266,9 @@ export default {
     formatTwo(row) {
       return this.dict.label.IS_OR_NOT[row.need_lash_two]
     },
+    boxType(row) {
+      return this.dict.label.BOX_STRUCTURE[row.box_structure]
+    },
     updateOne() {
       this.dialogVisible2 = true
     },