feat(wms): 入库订单增加入库方式筛选和显示

- 在入库订单查询表单中添加入库方式选择框
- 在入库订单表格中添加入库方式列- 更新入库订单相关接口和类型定义，增加入库方式字段
- 修改物料选择组件的导入路径

src/api/wms/instockOrder/types.ts

@@ -51,6 +51,11 @@ export interface InstockOrderVO {
    */
   warehouseId: string | number;
 
+  /**
+   * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+   */
+  instockMethond: string;
+
 }
 
 export interface InstockOrderForm extends BaseEntity {
@@ -106,6 +111,11 @@ export interface InstockOrderForm extends BaseEntity {
    */
   warehouseId?: string | number;
 
+    /**
+   * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+   */
+    instockMethond?: string;
+
 }
 
 export interface InstockOrderQuery extends PageQuery {
@@ -162,6 +172,11 @@ export interface InstockOrderQuery extends PageQuery {
    */
   warehouseId?: string | number;
 
+  /**
+   * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+   */
+  instockMethond?: string;
+
     /**
      * 日期范围参数
      */

src/views/wms/instockOrderCopy/index.vue

@@ -10,6 +10,11 @@
                 <el-option v-for="dict in wms_instock_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
+            <el-form-item label="入库方式" prop="instockMethond">
+              <el-select v-model="queryForm.instockMethond" placeholder="请选择入库方式" clearable >
+                <el-option v-for="dict in instock_methond" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
             <el-form-item label="审核状态" prop="auditStatus">
               <el-select v-model="queryForm.auditStatus" placeholder="请选择审核状态" clearable >
                 <el-option v-for="dict in approve_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -67,6 +72,11 @@
             <dict-tag :options="wms_instock_type" :value="scope.row.instockType"/>
           </template>
         </el-table-column>
+        <el-table-column label="入库方式" align="center" prop="instockMethond">
+          <template #default="scope">
+            <dict-tag :options="instock_methond" :value="scope.row.instockMethond"/>
+          </template>
+        </el-table-column>
         <el-table-column label="订单编号" align="center" prop="orderNo"/>
         <el-table-column label="审核人" align="center" prop="auditBy"/>
         <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
@@ -544,7 +554,7 @@ import {
   getMaterialList, getInstockMaterialList
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
+import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
@@ -558,8 +568,9 @@ const {audit_behave,
   mes_material_categories,
   wms_allocate_status,
   wms_allocate_create,
-  wms_allocate_way
-} = toRefs<any>(proxy?.useDict('audit_behave', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way'));
+  wms_allocate_way,
+  instock_methond
+} = toRefs<any>(proxy?.useDict('audit_behave', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way', 'instock_methond'));
 
 
 interface User {

src/views/wms/linkage/index.vue

@@ -444,7 +444,7 @@ import {
   getMaterialList, viewAllocateOrderDetail, delAllocateOrderDetail, allocateOrderUpdate
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
+import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
 
 import {reactive} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'

src/views/wms/outstockOrderCopy/index.vue

@@ -484,7 +484,7 @@ import {
   getMaterialList
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
+import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';