diff --git a/src/api/wms/instockOrder/types.ts b/src/api/wms/instockOrder/types.ts
index b5d537d..46c932c 100644
--- a/src/api/wms/instockOrder/types.ts
+++ b/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;
+
/**
* 日期范围参数
*/
diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index d09bb41..ee8f1d7 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -10,6 +10,11 @@
+
+
+
+
+
@@ -67,6 +72,11 @@
+
+
+
+
+
@@ -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(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(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 {
diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue
index 0767d81..25dc9aa 100644
--- a/src/views/wms/linkage/index.vue
+++ b/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'
diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index 502ed38..3aee6d9 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/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';