报废收货修改

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 })

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 })

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 })

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

@@ -67,7 +67,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptJobMain.data'
+import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptscrapJobMain.data'
 import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
 import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -107,7 +107,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptJobMainApi.getProductreceiptJobMainPage // 分页接口
+  getListApi: ProductreceiptJobMainApi.getProductreceiptscapJobMainPage // 报废收货分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue

@@ -85,7 +85,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptRecordMain.data'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptscrapRecordMain.data'
 import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
 import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -127,7 +127,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRecordMainApi.getProductreceiptRecordMainPage // 分页接口
+  getListApi: ProductreceiptRecordMainApi.getProductreceiptRecordMainScrapPage // 报废收货分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@@ -119,7 +119,7 @@ import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
   ProductreceiptRequestDetailRules, BackflushDetailRequest,
-  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptRequestMain.data'
+  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptscrapRequestMain.data'
 import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
 import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
 import * as BackflushRequestDetailbApi from '@/api/wms/backflushRequestDetailb'
@@ -202,7 +202,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainPage // 分页接口
+  getListApi: ProductreceiptRequestMainApi.getProductreceiptRequestMainScrapPage // 报废收货分页接口
 })
 
 // 获得表格的各种操作
@@ -667,4 +667,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate()
 })
-</script>
+</script>

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptRequestMain.data.ts → src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts

@@ -431,6 +431,23 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    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',