fix:组盘、入库相关业务修改为混料

nladmin-ui/src/views/wms/basedata/group/AddDialog.vue

@@ -230,7 +230,22 @@ export default {
       }
     },
     materialChoose(row) {
-      this.form.tableData = row
+      debugger
+      // 对新增的行进行校验不能存在相同物料批次
+      row.forEach((item) => {
+        debugger
+        let same_mater = true
+        this.form.tableData.forEach((row) => {
+          debugger
+          if (row.material_code === item.material_code && row.pcsn === item.pcsn) {
+            debugger
+            same_mater = false
+          }
+        })
+        if (same_mater) {
+          this.form.tableData.splice(-1, 0, item)
+        }
+      })
     },
     async insertEvent(row) {
       this.dtlShow = true

nladmin-ui/src/views/wms/basedata/group/group.js

@@ -24,4 +24,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function getAllGroupInfo(data) {
+  return request({
+    url: 'api/group/getAllGroupInfo',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getAllGroupInfo }

nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue

@@ -29,7 +29,7 @@
 
     <!--表格渲染-->
     <el-table
-      ref="table"
+      ref="table2"
       v-loading="crud.loading"
       :data="crud.data"
       style="width: 100%;"
@@ -49,7 +49,7 @@
       <el-table-column prop="material_name" label="物料名称" width="170" show-overflow-tooltip />
       <el-table-column prop="material_spec" label="物料规格" width="170" show-overflow-tooltip/>
       <el-table-column prop="class_name" label="物料分类" width="140" />
-      <el-table-column prop="unit_name" label="计量单位" />
+      <el-table-column prop="qty_unit_name" label="计量单位" />
       <el-table-column prop="product_series_name" label="系列" />
       <el-table-column prop="update_optname" label="修改人" />
       <el-table-column prop="update_time" label="修改时间" width="135" />
@@ -112,20 +112,21 @@ export default {
       this.tableRadio = item
     },
     open() {
-
+      this.crud.refresh()
     },
     close() {
       this.crud.resetQuery(false)
       this.$emit('update:dialogShow', false)
     },
     submit() {
+      debugger
       // 处理单选
       if (this.isSingle && this.tableRadio) {
         this.$emit('update:dialogShow', false)
         this.$emit('materialChoose', this.tableRadio)
         return
       }
-      this.rows = this.$refs.table.selection
+      this.rows = this.$refs.table2.selection
       if (this.rows.length <= 0) {
         this.$message('请先勾选物料')
         return

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

@@ -77,12 +77,12 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
-import crudRawAssist from '@/views/wms/st/inbill/rawassist'
+import group, { getAllGroupInfo } from '@/views/wms/basedata/group/group.js'
 
 const start = new Date()
 export default {
   name: 'AddDtl',
-  components: { crudOperation, rrOperation, pagination, DateRangePicker },
+  components: { crudOperation, rrOperation, pagination, DateRangePicker, group },
   cruds() {
     return CRUD({
       title: '用户',
@@ -149,10 +149,10 @@ export default {
       console.log('获取的rows:')
       console.log(this.rows)
       this.$emit('tableChanged', this.rows)
-      // crudRawAssist.queryBoxMater(this.rows).then(res => {
-      //   this.rows = res
-      //   this.$emit('tableChanged', this.rows)
-      // })
+      group.getAllGroupInfo(this.rows).then(res => {
+        this.rows = res.content
+        this.$emit('tableChanged', this.rows)
+      })
       // this.form = this.$options.data().form
     }
   }