diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 518185c62..0939d290e 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -70,6 +70,7 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @onChange="onChange"
   >
     <template v-slot="{ row }">
       <el-date-picker
@@ -168,7 +169,8 @@ import {
   ProductreceiptRequestDetailRules,
   BackflushDetailRequest,
   ProductreceiptRequestLabel,
-  ProductreceiptRequestLabelRules
+  ProductreceiptRequestLabelRules,
+  shiftList
 } from './productreceiptRequestMain.data'
 import { SupplierdeliverRequestPackage } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
 // } from '../../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
@@ -238,6 +240,19 @@ const { getList: getDetailListBom } = detatableMethodsBom
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
+const onChange = (field, cur) => {
+  if(field=='shift'){
+    //班次
+    let findItem = shiftList.list.find(item=>item['code'] == cur)
+    if(findItem){
+      formRef.value.formRef.setValues({
+        shiftName:findItem['name']
+      })
+    }
+    console.log('onChange',field, cur,findItem)
+
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
@@ -270,6 +285,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       } else if ('productionLineCode' == formField) {
         //生产线代码
         tableData.value = []
+      } else if ('team' == formField) {
+        //班组
+        setV['teamName'] = val[0]['name']
       }
       formRef.setValues(setV)
     }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 202892c28..122cf480e 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -42,7 +42,7 @@ const queryParams = {
 }
 const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
 const requestsettingData = data?.list[0] || {}
-const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
+export const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
 console.log('shiftList',shiftList)
 // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
@@ -197,6 +197,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     sortTableDefault: 1000,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -224,6 +225,16 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '班组',
+    field: 'teamName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    sortTableDefault: 1001,
+  },
   {
     label: '班次',
     field: 'shift',
@@ -231,13 +242,14 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     sortTableDefault: 1001,
     form: {
       component:'Select',
       componentProps:{
           options:shiftList.list,
           optionsAlias: {
-            labelField: 'code',
+            labelField: 'name',
             valueField: 'code'
           },
           verificationParams: [{
@@ -276,6 +288,16 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     //   }
     // }
   },
+  {
+    label: '班次',
+    field: 'shiftName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    sortTableDefault: 1001
+  },
   {
     label: '收货类型',
     field: 'type',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 8f14cd9e8..6bb1cae35 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -59,6 +59,7 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @onChange="onChange"
   >
   <template  v-slot="{row}">
     <el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']):dayjs('2099-12-31').valueOf()"
@@ -136,7 +137,7 @@ import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
   ProductreceiptRequestDetailRules, BackflushDetailRequest,
-  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptAssembleRequestMain.data'
+  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules,shiftList } from './productreceiptAssembleRequestMain.data'
 import {
   SupplierdeliverRequestPackage
 } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
@@ -200,7 +201,19 @@ const { getList:getDetailListBom } = detatableMethodsBom
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
+const onChange = (field, cur) => {
+  if(field=='shift'){
+    //班次
+    let findItem = shiftList.list.find(item=>item['code'] == cur)
+    if(findItem){
+      formRef.value.formRef.setValues({
+        shiftName:findItem['name']
+      })
+    }
+    console.log('onChange',field, cur,findItem)
 
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
@@ -234,6 +247,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }else if('productionLineCode'==formField){
          //生产线代码
         tableData.value = []
+      } else if ('team' == formField) {
+        //班组
+        setV['teamName'] = val[0]['name']
       }
       formRef.setValues(setV)
     }
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index de84e7135..643d79520 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -43,7 +43,7 @@ const queryParams = {
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
 
- const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
+ export const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
  console.log('shiftList',shiftList)
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
@@ -206,6 +206,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     sortTableDefault: 1001,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -233,6 +234,16 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '班组',
+    field: 'teamName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    sortTableDefault: 1001,
+  },
   {
     label: '班次',
     field: 'shift',
@@ -240,13 +251,14 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     sortTableDefault: 1001,
     form: {
       component:'Select',
       componentProps:{
           options:shiftList.list,
           optionsAlias: {
-            labelField: 'code',
+            labelField: 'name',
             valueField: 'code'
           },
           verificationParams: [{
@@ -285,6 +297,16 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     //   }
     // }
   },
+  {
+    label: '班次',
+    field: 'shiftName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    sortTableDefault: 1001
+  },
   {
     label: '收货类型',
     field: 'type',