add:增加组盘，出入库兼容混乱情况，数据库组盘表需要MD5字段需要修改

nladmin-ui/src/views/wms/st/inbill/DivDialog.vue

@@ -72,6 +72,20 @@
           label="数量"
           align="center"
         />
+        <el-table-column
+          show-overflow-tooltip
+          prop="assign_qty"
+          :formatter="crud.formatNum3"
+          label="分配数量"
+          align="center"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="unassign_qty"
+          :formatter="crud.formatNum3"
+          label="未分配数量"
+          align="center"
+        />
         <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
         <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" align="center" />
         <el-table-column show-overflow-tooltip prop="source_bill_type" label="源单类型" align="center" />
@@ -155,10 +169,13 @@
         :data="form.tableMater"
         style="width: 100%;"
         max-height="300"
+        highlight-current-row
+        @row-click="clcikDisRow"
         border
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       >
         <el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
+        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
@@ -166,7 +183,7 @@
           show-overflow-tooltip
           prop="plan_qty"
           :formatter="crud.formatNum3"
-          label="数量"
+          label="重量"
           align="center"
         />
         <el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
@@ -191,7 +208,6 @@ import crudSectattr from '@/views/wms/basedata/sectattr/sectattr'
 import StructDiv from '@/views/wms/pub/StructDialog'
 import crudRawAssist, { allDivStruct } from '@/views/wms/st/inbill/rawassist'
 import crudPoint from '@/views/wms/sch/point/schBasePoint'
-import { getPointList } from '../../sch/point/schBasePoint'
 
 export default {
   name: 'DivDialog',
@@ -237,6 +253,7 @@ export default {
       sect_val: null,
       form: {
         dtl_row: null,
+        dis_row: null,
         storage_qty: '',
         point_code: null,
         checked: true,
@@ -259,7 +276,10 @@ export default {
       crudSectattr.getSectCode({ 'stor_id': this.storId }).then(res => {
         this.sects = res.content
       })
-      crudPoint.getPointList().then(res => {
+
+      const area_type = 'RKQ'
+
+      crudPoint.getPointList({ 'region_code': area_type }).then(res => {
         this.pointlist = res
       })
     },
@@ -281,11 +301,15 @@ export default {
       crudRawAssist.getIODtl({ 'bill_code': this.form.dtl_row.bill_code }).then(res => {
         this.openParam = res
         this.form.dtl_row = res[row.index]
+        this.form.dis_row = null
       })
       crudRawAssist.getDisDtl(row).then(res => {
         this.form.tableMater = res
       })
     },
+    clcikDisRow(row, column, event) {
+      this.form.dis_row = row
+    },
     tableRowClassName({ row, rowIndex }) {
       row.index = rowIndex
     },
@@ -312,7 +336,6 @@ export default {
     },
     sectQueryChange(val) {
       this.sectProp = val
-      debugger
       if (val.length === 1) {
         this.stor_code = val[0]
         this.sect_code = ''
@@ -337,8 +360,6 @@ export default {
         this.form.tableMater[i].sect_name = row.sect_name
         this.form.tableMater.splice(i, 1, this.form.tableMater[i]) // 通过splice 替换数据 触发视图更新
       }
-      this.form.sect_code = this.sect_code
-      this.form.stor_code = this.stor_code
       crudRawAssist.divStruct(this.form).then(res => {
         crudRawAssist.getIODtl({ 'bill_code': this.form.dtl_row.bill_code, 'open_flag': '1' }).then(res => {
           this.openParam = res
@@ -370,9 +391,12 @@ export default {
         this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
+      if (!this.form.dis_row) {
+        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
       // 如果勾选了，直接跳后台
       if (this.form.checked) {
-        debugger
         if (!this.sect_code) {
           this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
           return
@@ -387,6 +411,7 @@ export default {
           crudRawAssist.getDisDtl(this.form.dtl_row).then(res => {
             this.form.tableMater = res
             this.divBtn = false
+            this.form.dis_row = null
             this.crud.notify('分配货位成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
           })
         }).finally(() => {
@@ -405,9 +430,8 @@ export default {
         this.crud.notify('不存在载具明细！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      const flag = this.form.tableMater.some(mater => !mater.struct_code)
-      if (flag) {
-        this.crud.notify('明细存在未分配货位！', CRUD.NOTIFICATION_TYPE.INFO)
+      if (!this.form.dis_row) {
+        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
       // 如果勾选了，直接跳后台
@@ -417,6 +441,7 @@ export default {
         })
         crudRawAssist.getDisDtl(this.form.dtl_row).then(res => {
           this.form.tableMater = res
+          this.form.dis_row = null
           this.crud.notify('取消分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         })
       })