rev：子卷装箱

lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue

@@ -33,7 +33,7 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         :row-key="row => row.name"
         :span-method="handleSpanMethod"
-        @row-click="handleRowClick"
+        @row-click="handleRowClick"handleRowClick
       >
         <!-- 列的定义... -->
         <!--        <el-table-column prop="box_group" label="木箱组 " align="center" width="120">-->
@@ -117,12 +117,14 @@
         <el-table-column show-overflow-tooltip prop="box_group" label="木箱组" align="center" width="130" />
         <el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" />
         <el-table-column show-overflow-tooltip prop="paper_tube_description" label="子卷规格" align="center" />
+        <el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" align="center" />
       </el-table>
     </el-card>
     <MaterDiv
       ref="child"
       :dialog-show.sync="structShow"
       :paper-tube-description="paperTubeDescription"
+      :box-type="box_type"
       :sect-prop="sectProp"
       @tableChanged="tableChanged"
     />
@@ -172,6 +174,7 @@ export default {
       isButtonDisabled: false, // 木箱规格分配按钮
       isButtonDisabled1: true, // 手动同步MES按钮
       searchText: '',
+      box_type: '',
       // 存储搜索前的选中状态
       previousSelection: [],
       // 存储搜索后的选中状态
@@ -316,6 +319,8 @@ export default {
       const selectedRows = table2Data.filter(row => (row.container_name == groupValue) || (row.box_group === groupValue && row.box_group !== null && row.box_group !== '0'))
       table2.clearSelection()
       selectedRows.forEach(row => table2.toggleRowSelection(row))
+      // 给木箱料号赋值
+      this.box_type = scope.box_type
     },
     // 表格2的行点击事件
     handleSelectionChange(selection) {

lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue

@@ -44,6 +44,7 @@
       <el-table-column prop="box_length" label="木箱长度" />
       <el-table-column prop="box_width" label="木箱宽度" />
       <el-table-column prop="box_high" label="木箱高度" />
+      <el-table-column prop="ivt_num" label="木箱库存数" />
       <el-table-column prop="num" label="最大装卷数" />
     </el-table>
     <!--分页组件-->
@@ -117,6 +118,10 @@ export default {
     paperTubeDescription: {
       type: String,
       default: ''
+    },
+    boxType: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -176,6 +181,7 @@ export default {
       this.query.is_lock = '1'
       this.query.lock = this.lock
       this.query.is_used = '1'
+      this.query.search = this.boxType
       this.crud.toQuery()
     },
     handleSelectionChange(val, row) {