rev:损益支持多个托盘

mes/qd/src/views/wms/sch/point/index.vue

@@ -223,6 +223,7 @@
         <el-table-column prop="lock_type_name" label="锁定类型" />
         <el-table-column prop="area_type_name" label="所属区域" width="110" />
         <el-table-column prop="vehicle_code" label="载具编码" />
+        <el-table-column prop="num" label="桶数" />
         <el-table-column prop="taskdtl_type" label="锁定任务类型" width="110" :formatter="taskdtl_typeFormat" />
         <el-table-column prop="task_code" label="锁定任务编码" width="100" />
         <el-table-column prop="inv_code" label="锁定单据编码" width="130" />

mes/qd/src/views/wms/st/inStor/moreOrless/AddDialog.vue

@@ -61,8 +61,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="货位" prop="struct_code">
-        <label slot="label">货&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位:</label>
+      <el-form-item label="添加货位" prop="struct_code">
+        <label slot="label">添加货位:</label>
         <el-input v-model.trim="form.struct_code" style="width: 210px" disabled placeholder="选择货位">
           <el-button v-show="crud.status.view <= 0" slot="append" icon="el-icon-plus" @click="queryStruct()" />
         </el-input>
@@ -128,6 +128,7 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column prop="struct_name" label="货位名称" align="center" min-width="150" show-overflow-tooltip />
       <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" align="center" width="150px">
         <template scope="scope">
           <el-input v-show="!scope.row.edit && scope.row.is_add" v-model="scope.row.storagevehicle_code" size="mini" />
@@ -367,11 +368,11 @@ export default {
           return false
         }
         const vehicle_code = this.form.tableData[i].storagevehicle_code
-        const same = this.form.tableData.some(mater => mater.storagevehicle_code !== vehicle_code)
-        if (same) {
-          this.crud.notify('存在不同载具号', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
+        // const same = this.form.tableData.some(mater => mater.storagevehicle_code !== vehicle_code)
+        // if (same) {
+        //   this.crud.notify('存在不同载具号', CRUD.NOTIFICATION_TYPE.INFO)
+        //   return false
+        // }
       }
     },
     billTypeChange(val) {
@@ -418,9 +419,20 @@ export default {
       this.form.sect_id = row.sect_id
       this.form.sect_name = row.sect_name
       this.form.struct_name = row.struct_name
+      // 向列表添加数据
       crudMoreOrless.getStructIvt({ 'struct_id': row.struct_id }).then(res => {
-        this.form.tableData = res
-        this.form.dtl_num = this.form.tableData.length
+        res.forEach((item) => {
+          let same_mater = true
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            if (this.form.tableData[i].bucketunique === item.bucketunique) {
+              same_mater = false
+            }
+          }
+          if (same_mater) {
+            this.form.tableData.splice(-1, 0, item)
+            this.form.dtl_num += 1
+          }
+        })
       })
     },
 

mes/qd/src/views/wms/st/inStor/moreOrless/index.vue

@@ -139,7 +139,6 @@
           </template>
         </el-table-column>
         <el-table-column  :formatter="typeFormat" prop="mol_inv_type" label="损溢类型" />
-        <el-table-column prop="struct_name" label="货位" min-width="150" />
         <el-table-column label="明细数" align="center" prop="dtl_num" min-width="100" />
         <el-table-column label="重量" align="center" prop="total_qty" min-width="100" >
           <template slot-scope="scope">