add：1.外包材收货2.外包材转运

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

@@ -64,4 +64,12 @@ export function printDelete(data) {
   })
 }
 
-export default { add, edit, del, queryMater, checkVehicle, querySupp, copySave, printDelete }
+export function queryMaterList(data) {
+  return request({
+    url: 'api/group/queryMaterList',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, queryMater, checkVehicle, querySupp, copySave, printDelete, queryMaterList }

wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue

@@ -93,7 +93,23 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="物料编码" prop="material_code">
-                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0" @change="queryMater" />
+                <el-select
+                  v-model="form.material_code"
+                  size="mini"
+                  placeholder="全部"
+                  style="width: 200px"
+                  class="filter-item"
+                  filterable
+                  :disabled="crud.status.edit > 0"
+                  @change="queryMater"
+                >
+                  <el-option
+                    v-for="item in materList"
+                    :key="item.material_code"
+                    :label="item.material_name"
+                    :value="item.material_code"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
 
@@ -260,6 +276,7 @@ export default {
     return {
       permission: {},
       openParam: {},
+      materList: [],
       openAddDtlDialog: false,
       suppList: [],
       rules: {
@@ -285,6 +302,9 @@ export default {
     crudGroup.querySupp({}).then(row => {
       this.suppList = row
     })
+    crudGroup.queryMaterList({}).then(res => {
+      this.materList = res
+    })
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

wms/nladmin-ui/src/views/wms/pdm_manage/packaging/index.vue

@@ -45,7 +45,23 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="物料编码" prop="material_code">
-                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0" @change="queryMater" />
+                <el-select
+                  v-model="form.material_code"
+                  size="mini"
+                  placeholder="全部"
+                  style="width: 200px"
+                  class="filter-item"
+                  filterable
+                  :disabled="crud.status.edit > 0"
+                  @change="queryMater"
+                >
+                  <el-option
+                    v-for="item in materList"
+                    :key="item.material_code"
+                    :label="item.material_name"
+                    :value="item.material_code"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
 
@@ -65,7 +81,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="物料批号" prop="pcsn">
-                <el-input v-model="form.pcsn" style="width: 200px;" />
+                <el-input v-model="form.pcsn" style="width: 200px;" :disabled="crud.status.edit > 0" />
               </el-form-item>
             </el-col>
 
@@ -74,6 +90,12 @@
                 <el-input-number v-model="form.qty" :precision="2" :controls="false" :min="1" style="width: 200px" />
               </el-form-item>
             </el-col>
+
+            <el-col :span="8">
+              <el-form-item label="点位编码" prop="point_code">
+                <el-input v-model="form.point_code" style="width: 200px;" :disabled="crud.status.edit > 0" />
+              </el-form-item>
+            </el-col>
           </el-row>
 
           <el-row>
@@ -100,6 +122,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
+        <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',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="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
@@ -177,6 +200,7 @@ export default {
   data() {
     return {
       permission: {},
+      materList: [],
       rules: {
         material_code: [
           { required: true, message: '物料不能为空', trigger: 'blur' }
@@ -184,12 +208,20 @@ export default {
         pcsn: [
           { required: true, message: '批次不能为空', trigger: 'blur' }
         ],
+        point_code: [
+          { required: true, message: '点位编码不能为空', trigger: 'blur' }
+        ],
         qty: [
           { required: true, message: '收货重量不能为空', trigger: 'blur' }
         ]
       }
     }
   },
+  created() {
+    crudGroup.queryMaterList({}).then(res => {
+      this.materList = res
+    })
+  },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {