opt:

1.子卷装箱增加子卷质检生成包装关系，去除临时包装关系；
2.修改最后一个子卷判断方式；
3.恢复装箱毛重推送，优化装箱页面；

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

@@ -33,7 +33,8 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         :row-key="row => row.name"
         :span-method="handleSpanMethod"
-        @row-click="handleRowClick"handleRowClick
+        handle-row-click
+        @row-click="handleRowClick"
       >
         <!-- 列的定义... -->
         <!--        <el-table-column prop="box_group" label="木箱组 " align="center" width="120">-->
@@ -45,6 +46,9 @@
         <el-table-column show-overflow-tooltip prop="quanlity_in_box" label="箱内子卷数" align="center" />
         <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="paper_weight" label="子管重量" align="center" />
+        <el-table-column show-overflow-tooltip prop="weight" label="子卷重量" align="center" />
+        <el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" align="center" />
       </el-table>
     </el-card>
     <div style="margin-bottom: 20px;" />
@@ -117,6 +121,8 @@
         <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="paper_weight" label="子管重量" align="center" />
+        <el-table-column show-overflow-tooltip prop="weight" label="子卷重量" align="center" />
         <el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" align="center" />
       </el-table>
     </el-card>
@@ -319,6 +325,7 @@ 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 = ''
       // 给木箱料号赋值
       this.box_type = scope.box_type
     },
@@ -328,11 +335,18 @@ export default {
       if (selection.length > 0) {
         this.isButtonDisabled = !selection.every(item => item.status === '99')
         this.isButtonDisabled1 = selection.some(item => item.status === '99')
+        this.box_type = ''
+        // 给木箱料号赋值
+        const box_type = selection.filter(item => item.box_type !== '' && item.box_type !== null)
+        if (box_type.length > 0) {
+          this.box_type = box_type[0].box_type
+        }
         this.currentSelection = selection
         if (!this.searchText) {
           this.previousSelection = selection
         }
       } else {
+        debugger
         if (!this.searchText) {
           this.cancelSelection = []
           this.cancelSelection = [...this.currentSelection]
@@ -370,8 +384,8 @@ export default {
         this.crud.notify('子卷数量超过木箱的最大装卷数！', CRUD.NOTIFICATION_TYPE.WARNING)
         return
       }
+      debugger
       this.form.checked = row.material_code
-      this.form.box_weight = row.box_weight
       this.form.sale_order_name = this.saleOrderName
       await crudPackagerelation.updateEntityList(this.form)
       const res = crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.saleOrderName })
@@ -392,6 +406,12 @@ export default {
         const paper_tube_description = descriptionList[0].paper_tube_description
         const descriptionsAreSame = this.currentSelection.every(item => item.paper_tube_description === paper_tube_description)
         if (descriptionsAreSame) {
+          // 给木箱料号赋值
+          const box_type = this.currentSelection.filter(item => item.box_type !== '' && item.box_type !== null)
+          if (box_type.length > 0) {
+            this.box_type = ''
+            this.box_type = box_type[0].box_type
+          }
           this.paperTubeDescription = paper_tube_description
           this.structShow = true
           this.$refs.child.getMsg(false)

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

@@ -38,7 +38,6 @@
       @select-all="onSelectAll"
     >
       <el-table-column type="selection" width="55" />
-      <!--      <el-table-column prop="box_no" label="木箱号" :min-width="flexWidth('box_no',crud.data,'木箱号')" />-->
       <el-table-column prop="material_code" label="木箱规格" :min-width="flexWidth('material_code',crud.data,'木箱规格')" />
       <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
       <el-table-column prop="box_length" label="木箱长度" />

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

@@ -225,13 +225,14 @@ export default {
     },
     async divOpen() {
       this.saleOrderName = this.currentRow.sale_order_name
-      const res = await crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.currentRow.sale_order_name })
+      const queryParam = { sale_order_name: this.currentRow.sale_order_name, type: '0' }
+      const res = await crudSubpackagerelation.queryContainerization(queryParam)
       this.openParam = res.content
       // this.divShow = true
     },
     divOpen1() {
-      this.saleOrderName = this.currentRow.sale_order_name
-      crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.currentRow.sale_order_name }).then(res => {
+      const queryParam = { sale_order_name: this.currentRow.sale_order_name, type: '0' }
+      crudSubpackagerelation.queryContainerization(queryParam).then(res => {
         this.openParam = res.content
         this.divShow = true
       })

lms/nladmin-ui/src/views/wms/pdm/sub/packagerelation.js

@@ -24,11 +24,11 @@ export function edit(data) {
   })
 }
 
-export function queryContainerization(params) {
+export function queryContainerization(data) {
   return request({
     url: '/api/pdmBiSubpackagerelation/queryContainerNameBySaleOrder',
-    method: 'get',
-    params
+    method: 'post',
+    data
   })
 }