diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
index d52d825bb..8f06b62f8 100644
--- a/src/api/wms/productreceiptJobMain/index.ts
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -66,6 +66,19 @@ export const getProductreceiptJobMainAssemblePage = async (params) => {
}
}
+// 查询报废收货货任务主列表
+export const getProductreceiptscapJobMainPage = async (params) => {
+ params.type = 'scrap'
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/productreceipt-job-main/senior', data })
+ } else {
+ return await request.get({ url: `/wms/productreceipt-job-main/page`, params })
+ }
+}
+
+
// 查询制品收货任务主详情
export const getProductreceiptJobMain = async (id: number) => {
return await request.get({ url: `/wms/productreceipt-job-main/get?id=` + id })
diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index 1d71bfbd1..79b5699c9 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -51,6 +51,18 @@ export const getProductreceiptRecordMainAssemblePage = async (params) => {
}
}
+// 查询报废收货记录主列表
+export const getProductreceiptRecordMainScrapPage = async (params) => {
+ params.type = 'scrap'
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/productreceipt-record-main/senior', data })
+ } else {
+ return await request.get({ url: `/wms/productreceipt-record-main/page`, params })
+ }
+}
+
// 查询制品收货记录主详情
export const getProductreceiptRecordMain = async (id: number) => {
return await request.get({ url: `/wms/productreceipt-record-main/get?id=` + id })
diff --git a/src/api/wms/productreceiptRequestMain/index.ts b/src/api/wms/productreceiptRequestMain/index.ts
index d244cb3b5..0d337b177 100644
--- a/src/api/wms/productreceiptRequestMain/index.ts
+++ b/src/api/wms/productreceiptRequestMain/index.ts
@@ -49,6 +49,19 @@ export const getProductreceiptRequestMainAssemblePage = async (params) => {
}
}
+// 查询报废收货申请主列表
+export const getProductreceiptRequestMainScrapPage = async (params) => {
+ params.type = 'scrap'
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/productreceipt-request-main/senior', data })
+ } else {
+ return await request.get({ url: `/wms/productreceipt-request-main/page`, params })
+ }
+}
+
+
// 查询制品收货申请主详情
export const getProductreceiptRequestMain = async (id: number) => {
return await request.get({ url: `/wms/productreceipt-request-main/get?id=` + id })
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index 77a975dbc..d99b2eb65 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -67,7 +67,7 @@
+
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
similarity index 99%
rename from src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts
rename to src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index ee5f02722..f53d8bba2 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -431,6 +431,23 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([
}
}
},
+ {
+ label: '收货类型',
+ field: 'type',
+ dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+ dictClass: 'string',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ value: 'scrap',
+ componentProps: {
+ disabled: true
+ }
+ },
+ isForm: false
+ },
{
label: '操作',
field: 'action',