diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index d0891440f..200841c0a 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as ShiftApi from '@/api/wms/shift'
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
 
 /**
  * @returns {Array} 制品收货任务主表
@@ -99,6 +101,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
   },
   {
     label: '收货类型',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index 2b3d1d629..c6791cdac 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as ShiftApi from '@/api/wms/shift'
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
 
 /**
  * @returns {Array} 制品收货记录主表
@@ -94,7 +96,18 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: true
+    isTable: true,
+    isSearch: true,
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
   },
   {
     label: '收货类型',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 122cf480e..85e460036 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -262,31 +262,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           }], // 失去焦点校验参数
       }
     }
-    // form: {
-    //   // labelMessage: '信息提示说明！！！',
-    //   componentProps: {
-    //     enterSearch: true,
-    //     isSearchList: true,
-    //     searchListPlaceholder: '请选择班次',
-    //     searchField: 'code',
-    //     searchTitle: '班次信息',
-    //     searchAllSchemas: Shift.allSchemas,
-    //     searchPage: ShiftApi.getShiftPage,
-    //     searchCondition: [{
-    //       key: 'available',
-    //       value: 'TRUE',
-    //       isMainValue: false
-    //     }],
-    //     verificationParams: [{
-    //       key: 'code',
-    //       action: '==',
-    //       value: '',
-    //       isMainValue: false,
-    //       isSearch: true,
-    //       isFormModel: true,
-    //     }], // 失去焦点校验参数
-    //   }
-    // }
+    
   },
   {
     label: '班次',
@@ -296,7 +272,19 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm:false,
-    sortTableDefault: 1001
+    sortTableDefault: 1001,
+    isSearch: true,
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
+    
   },
   {
     label: '收货类型',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index bc9a69400..bed0e1d08 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -1,6 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
-
+import * as ShiftApi from '@/api/wms/shift'
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
+console.log('shiftList',shiftList)
 /**
  * @returns {Array} 制品收货任务主表
  */
@@ -96,9 +98,20 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'shiftName',
     sort: 'custom',
     isTable:true,
+    isSearch:true,
     table: {
       width: 150
     },
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
   },
   {
     label: '收货类型',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
index daf572609..e3b004cc2 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as ShiftApi from '@/api/wms/shift'
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
 
 /**
  * @returns {Array} 制品收货记录主表
@@ -112,10 +114,21 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '班次',
     field: 'shiftName',
     sort: 'custom',
+    isSearch:true,
     isTable:true,
     table: {
       width: 150
     },
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
   },
   {
     label: '收货类型',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 643d79520..2c1becb57 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -271,31 +271,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           }], // 失去焦点校验参数
       }
     }
-    // form: {
-    //   // labelMessage: '信息提示说明！！！',
-    //   componentProps: {
-    //     enterSearch: true,
-    //     isSearchList: true,
-    //     searchListPlaceholder: '请选择班次',
-    //     searchField: 'code',
-    //     searchTitle: '班次信息',
-    //     searchAllSchemas: Shift.allSchemas,
-    //     searchPage: ShiftApi.getShiftPage,
-    //     searchCondition: [{
-    //       key: 'available',
-    //       value: 'TRUE',
-    //       isMainValue: false
-    //     }],
-    //     verificationParams: [{
-    //       key: 'code',
-    //       action: '==',
-    //       value: '',
-    //       isMainValue: false,
-    //       isSearch: true,
-    //       isFormModel: true,
-    //     }], // 失去焦点校验参数
-    //   }
-    // }
   },
   {
     label: '班次',
@@ -304,8 +279,19 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
     isForm:false,
-    sortTableDefault: 1001
+    sortTableDefault: 1001,
+    search: {
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          },
+      }
+    }
   },
   {
     label: '收货类型',