mdf:入库兼容混料

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

@@ -313,7 +313,7 @@ export default {
       rows.forEach((item) => {
         let same_mater = true
         this.form.tableData.forEach((row) => {
-          if (row.pcsn === item.pcsn) {
+          if (row.pcsn === item.pcsn && row.material_id === item.material_id) {
             same_mater = false
           }
         })

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

@@ -159,6 +159,7 @@
         :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" />