diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 012f7c534..58dc31c42 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -104,7 +104,12 @@ export const deleteBalance = async (id: number) => {
 
 // 导出库存余额 Excel
 export const exportBalance = async (params) => {
-  return await request.download({ url: `/wms/balance/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/balance/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/balance/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts
index e2de4e5f8..3d9c2a5e8 100644
--- a/src/api/wms/countJobMain/index.ts
+++ b/src/api/wms/countJobMain/index.ts
@@ -73,7 +73,13 @@ export const deleteCountJobMain = async (id: number) => {
 
 // 导出盘点任务主 Excel
 export const exportCountJobMain = async (params) => {
-  return await request.download({ url: `/wms/count-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countPlanMain/index.ts b/src/api/wms/countPlanMain/index.ts
index b62d13077..0e3bc85fb 100644
--- a/src/api/wms/countPlanMain/index.ts
+++ b/src/api/wms/countPlanMain/index.ts
@@ -60,7 +60,13 @@ export const deleteCountPlanMain = async (id: number) => {
 
 // 导出盘点计划主 Excel
 export const exportCountPlanMain = async (params) => {
-  return await request.download({ url: `/wms/count-plan-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-plan-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-plan-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countRecordMain/index.ts b/src/api/wms/countRecordMain/index.ts
index e4b43a074..35d2ef3db 100644
--- a/src/api/wms/countRecordMain/index.ts
+++ b/src/api/wms/countRecordMain/index.ts
@@ -56,7 +56,13 @@ export const deleteCountRecordMain = async (id: number) => {
 
 // 导出盘点记录主 Excel
 export const exportCountRecordMain = async (params) => {
-  return await request.download({ url: `/wms/count-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countRequestMain/index.ts b/src/api/wms/countRequestMain/index.ts
index cf6c52242..b353bf0f9 100644
--- a/src/api/wms/countRequestMain/index.ts
+++ b/src/api/wms/countRequestMain/index.ts
@@ -55,7 +55,13 @@ export const deleteCountRequestMain = async (id: number) => {
 
 // 导出盘点申请主 Excel
 export const exportCountRequestMain = async (params) => {
-  return await request.download({ url: `/wms/count-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countadjustRecordMain/index.ts b/src/api/wms/countadjustRecordMain/index.ts
index c07af7fe8..02dc4ed60 100644
--- a/src/api/wms/countadjustRecordMain/index.ts
+++ b/src/api/wms/countadjustRecordMain/index.ts
@@ -54,7 +54,13 @@ export const deleteCountadjustRecordMain = async (id: number) => {
 
 // 导出盘点调整记录主 Excel
 export const exportCountadjustRecordMain = async (params) => {
-  return await request.download({ url: `/wms/countadjust-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/countadjust-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/countadjust-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts
index 57ae5ee0e..4cc19ee4d 100644
--- a/src/api/wms/countadjustRequestMain/index.ts
+++ b/src/api/wms/countadjustRequestMain/index.ts
@@ -54,7 +54,13 @@ export const deleteCountadjustRequestMain = async (id: number) => {
 
 // 导出盘点调整申请主 Excel
 export const exportCountadjustRequestMain = async (params) => {
-  return await request.download({ url: `/wms/countadjust-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/countadjust-request-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/countadjust-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index 16cda3e7a..38b2e1f9e 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -50,7 +50,13 @@ export const deleteDemandforecastingMain = async (id: number) => {
 
 // 导出要货预测主 Excel
 export const exportDemandforecastingMain = async (params) => {
-  return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/inspectRecordMain/index.ts b/src/api/wms/inspectRecordMain/index.ts
index 6f3788867..3de2e0b1f 100644
--- a/src/api/wms/inspectRecordMain/index.ts
+++ b/src/api/wms/inspectRecordMain/index.ts
@@ -38,6 +38,7 @@ export interface InspectRecordMainVO {
   available: string
   sampleQty: number
   fromAreaTypes: string
+  putawayRequestFlag: boolean
 }
 
 // 查询检验记录主列表
@@ -85,3 +86,9 @@ export const exportInspectRecordMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/inspect-record-main/get-import-template' })
 }
+
+
+// 创建上架申请
+export const createPutAwayRequest = async (number:string) => {
+  return await request.post({ url: `/wms/inspect-record-main/createPutAwayRequestPC?number=`+number })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts
index fb50c380b..9fab97c09 100644
--- a/src/api/wms/purchasereceiptRecordMain/index.ts
+++ b/src/api/wms/purchasereceiptRecordMain/index.ts
@@ -31,6 +31,10 @@ export interface PurchasereceiptRecordMainVO {
   fromAreaCodes: string
   toAreaCodes: string
   available: string
+  putawayRequestFlag: boolean
+  putawayRequestNumber: string
+  inspectRequestFlag: boolean
+  inspectRequestNumber: string
 }
 
 // 查询采购收货记录主列表
@@ -77,4 +81,14 @@ export const exportPurchasereceiptRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchasereceipt-record-main/get-import-template' })
+}
+
+// 创建上架申请
+export const createPutawayRequest = async (number:string) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-main/createPutawayRequest?number=`+number })
+}
+
+// 创建检验申请
+export const createInspectRequest = async (number:string) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-main/createInspectRequest?number=`+number })
 }
\ No newline at end of file
diff --git a/src/api/wms/supplierUser/index.ts b/src/api/wms/supplierUser/index.ts
index bdb7c5b75..a7d284e80 100644
--- a/src/api/wms/supplierUser/index.ts
+++ b/src/api/wms/supplierUser/index.ts
@@ -45,7 +45,12 @@ export const deleteSupplierUser = async (id: number) => {
 
 // 导出供应商用户关联信息 Excel
 export const exportSupplierUser = async (params) => {
-  return await request.download({ url: `/wms/supplier-user/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplier-user/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/supplier-user/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/supplierdeliverRecordMain/index.ts b/src/api/wms/supplierdeliverRecordMain/index.ts
index c205031cc..e67f3b5a6 100644
--- a/src/api/wms/supplierdeliverRecordMain/index.ts
+++ b/src/api/wms/supplierdeliverRecordMain/index.ts
@@ -31,6 +31,8 @@ export interface SupplierdeliverRecordMainVO {
   creator: string
   serialNumber: string
   available: string
+  purchasereceiptRequestFlag: boolean
+  purchasereceiptRequestNumber: string
 }
 
 // 查询供应商发货记录主列表
@@ -77,4 +79,9 @@ export const exportSupplierdeliverRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplierdeliver-record-main/get-import-template' })
+}
+
+// 创建采购申请
+export const createPurchasereceiptRequest = async (number:string) => {
+  return await request.post({ url: `/wms/supplierdeliver-record-main/createPurchasereceiptRequest?number=`+number })
 }
\ No newline at end of file
diff --git a/src/api/wms/workstation/index.ts b/src/api/wms/workstation/index.ts
index 40e5dd648..5b0d662a5 100644
--- a/src/api/wms/workstation/index.ts
+++ b/src/api/wms/workstation/index.ts
@@ -61,7 +61,14 @@ export const importWorkstationTemplate = () => {
   return request.download({ url: '/wms/workstation/get-import-template' })
 }
 
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/workstation/get-import-template' })
-}
+
+// 根据库区筛选出的库位分页
+export const selectAreaTypeToLocation = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/workstation/pageAreaToLocationSenior', data })
+  } else {
+    return await request.get({ url: `/wms/workstation/pageAreaToLocation`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/views/report/goview/index.vue b/src/views/report/goview/index.vue
new file mode 100644
index 000000000..1bac28692
--- /dev/null
+++ b/src/views/report/goview/index.vue
@@ -0,0 +1,10 @@
+<template>
+  <ContentWrap>
+    <IFrame :src="src" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+defineOptions({ name: 'GoView' })
+
+const src = 'http://127.0.0.1:3000'
+</script>
diff --git a/src/views/report/jmreport/index.vue b/src/views/report/jmreport/index.vue
new file mode 100644
index 000000000..e05bb51f5
--- /dev/null
+++ b/src/views/report/jmreport/index.vue
@@ -0,0 +1,13 @@
+<template>
+  <ContentWrap>
+    <IFrame :src="src" />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { getAccessToken } from '@/utils/auth'
+
+defineOptions({ name: 'JimuReport' })
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/list?token=' + getAccessToken())
+</script>
diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue
index 196fe3fb9..e5a4303fc 100644
--- a/src/views/wms/basicDataManage/customerManage/project/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/project/index.vue
@@ -155,7 +155,7 @@ const openForm = (type: string, row?: any) => {
               item.componentProps.isSearchList = false
             }
             if (item.field == 'code') {
-              item.componentProps.disabled = TransferissueJobMain
+              item.componentProps.disabled = true
             }
           })       
   }else {
diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
index ff8f871f3..403fd4ce6 100644
--- a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
@@ -85,6 +85,14 @@ export const Documentsetting = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        max: 50,
+        precision: 0
+      }
+    },
   },
   {
     label: '号码分隔符',
@@ -252,8 +260,7 @@ export const DocumentsettingRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   serialLength: [
-    { required: true, message: '请输入号码流水长度', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true, message: '请输入号码流水长度', trigger: 'blur' }
   ],
   resetPeriod: [
     { required: true, message: '请选择流水重置周期', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
index f98b88837..b3f70053f 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
@@ -173,8 +173,8 @@ const openForm = (type: string, row?: any) => {
               item.componentProps.isSearchList = true
             }
             if (item.field == 'productionLineCode') {
-              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
             }
     })  
   }
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index 2059b78a5..c3bca9191 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -206,6 +206,31 @@ const formsSuccess = async (formType,data) => {
       getList()
 }
 
+// 修改 tableform 属性
+Workstation.allSchemas.tableFormColumns.map(item => {
+  if(item.field == 'rawLocationCode') {
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'areaType',
+        value: 'RAW',
+      },{
+          key: 'available',
+          value: 'TRUE',
+        }
+      ]
+    }
+    if(item.field == 'fgLocationCode') {
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'areaType',
+        value: 'FG',
+      },{
+          key: 'available',
+          value: 'TRUE',
+        }
+      ]
+    }
+  })
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 5067e369e..6ba60cf79 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -10,6 +10,9 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 
+
+import * as WorkstationApi from '@/api/wms/workstation'
+
 import { validateYS } from '@/utils/validator'
 
 const { t } = useI18n() // 国际化
@@ -118,14 +121,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }
-        // TODO： 陈放修改 ; 数据过滤 查询库区对应成品类型下的所有库位
-      ]
+        searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
       }
     }
   },
@@ -144,23 +140,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
-        }
-        // TODO： 陈放修改 ; 数据过滤 查询库区对应成品类型下的所有库位
-        // ,{
-        //   key: 'type',
-        //   value: 'FG',
-        //   action: '==',
-        //   isSearch: true,
-        //   isMainValue: false
-        // }
-      ]
+        searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index 6dc20de14..ed90ce54a 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -245,18 +245,18 @@ export const BomRules = reactive({
   ],
   processCode: [
     { required: true, message: '请输入工序代码', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'change' },
   ],
   version: [
     { required: true, message: '请输入版本', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
   ],
   layer: [
     { required: true, message: '请输入层级', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
index 33eec5260..f8b2e383e 100644
--- a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
@@ -16,6 +16,7 @@ export const BarcodeRules = reactive({
   length: [required],
   prefixLenght: [required],
   prefixChar: [
+    { required: true, message: '请输入前缀字符', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   entityProperties: [
@@ -29,6 +30,9 @@ export const BarcodeRules = reactive({
     { required: true, message: '请输入截断尾部空格', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  labelType:[
+    { required: true, message: '请选择标签类型', trigger: 'blur' }
+  ],
   isEncypt: [required],
 })
 
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
index 84c9f5d0d..8c4897667 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
@@ -121,8 +121,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'activeTime',
     isTable: true,
     formatter: dateFormatter,
-    details: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -143,8 +143,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'expireTime',
     isTable: true,
     formatter: dateFormatter,
-    details: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -166,8 +166,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm:false,
     formatter: dateFormatter,
-    details: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 7edd66126..d02106a9e 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -601,6 +601,7 @@ const submitForm = async (formType, data) => {
   })
   if (isExist) {
     formRef.value.formLoading = false
+    isExist = false
     return message.warning('包装号重复')
   }
   data.subList.forEach(item => {
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index 1c8b11411..5f867c3e1 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -131,12 +131,29 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:inspectRecordMain:putawayRequest'}), // 生成采购上架申请
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:inspectRecordMain:putawayRequest',hide:!row.putawayRequestFlag}), // 生成采购上架申请
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'putawayRequest') { // 生成采购上架申请
+      handlePutawayRequest(row.number)
+    }
+}
+
+
+/** 生成采购上架申请按钮操作 */
+const handlePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成上架申请吗？'))
+    tableObject.loading = true
+    await InspectRecordMainApi.createPutAwayRequest(number)
+    message.success(t('上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
index 39fb07152..abe003386 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
@@ -209,14 +209,6 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '订单号',
     field: 'poNumber',
@@ -413,6 +405,16 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
   }
 ]))
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index dd7691443..3990e757e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -125,14 +125,44 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceiptRecordMain:inspectRequest'}), // 生成到货检验申请
+   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:!row.inspectRequestFlag}),// 生成到货检验申请
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:!row.putawayRequestFlag}),// 生成采购上架申请
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'putawayRequest') { // 生成采购上架申请
-    handleExport()
+    handleCreatePutawayRequest(row.number)
+  }else if(val == 'inspectRequest'){//生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  }
+}
+
+
+/** 生成采购上架申请按钮操作 */
+const handleCreatePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成上架申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('到货检验申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index a3d89d47f..397a6a4ed 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -333,6 +333,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
   }
 ]))
 
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index ad5fb3059..fcc7cfafe 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -210,7 +210,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -221,7 +221,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 0c0d3f478..d14a075c8 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -73,7 +73,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index a1d4b1e7d..081ffc15d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -127,12 +127,28 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    // defaultButtons.mainListGenerateApplicationBtn(null), // 生成采购申请
+     defaultButtons.mainListGenerateApplicationBtn({hasPermi:'wms:supplierdeliver-record-main:createPurchasereceiptRequest',hide:!row.purchasereceiptRequestFlag}), // 生成采购申请
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if(val == 'generateApplication'){
+    handlerCreatePurchasereceiptRequest(row.number)
+  }
+}
+
+/** 生成采购收货申请按钮操作 */
+const handlerCreatePurchasereceiptRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成采购申请吗？'))
+    tableObject.loading = true
+    await SupplierdeliverRecordMainApi.createPurchasereceiptRequest(number)
+    message.success(t('采购申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index a39d843d3..d0c354779 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -105,6 +105,7 @@ import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequest
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import point from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue'
+import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
 
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })