diff --git a/src/api/wms/qadproductionplan/index.ts b/src/api/wms/qadproductionplan/index.ts
index c25893833..5eda9dfeb 100644
--- a/src/api/wms/qadproductionplan/index.ts
+++ b/src/api/wms/qadproductionplan/index.ts
@@ -26,6 +26,17 @@ export const getQadProductionPlanMainPage = async (params) => {
     return await request.get({ url: `/wms/qad-production-plan-main/page`, params })
   }
 }
+export const getQadProductionPlanDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/qad-production-plan-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/qad-production-plan-detail/page`, params })
+  }
+}
+
+
 
 // 查询QAD生产计划主详情
 export const getQadProductionPlanMain = async (id: number) => {
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 81fa5b6ee..0499f5144 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -52,6 +52,7 @@
     :apiCreate="ItempackagingApi.createItempackaging"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onEnter="onEnter"
   />
 
   <!-- 详情 -->
@@ -75,6 +76,10 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../itembasic/itembasic.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
 
 defineOptions({ name: 'Itempackaging' })
 
@@ -205,6 +210,41 @@ const formsSuccess = async (formType, data) => {
   basicFormRef.value.dialogVisible = false
   getList()
 }
+const onEnter = async (field,value)=>{
+  console.log('onEnter',field,value)
+  if('itemCode'==field){
+    //物料代码
+    basicFormRef.value.opensearchTable('itemCode', 'code', '物料基础信息', Itembasic.allSchemas, ItembasicApi.getItembasicPage,[{
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    },{
+      key: 'code',
+      value: value,
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }])
+
+  }else if('packUnit'==field){
+    //包装规格
+    basicFormRef.value.opensearchTable('packUnit', 'code', '包装规格信息', Packageunit.allSchemas, PackageunitApi.getPackageunitPage,[{
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    },{
+      key: 'code',
+      value: value,
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }])
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index fc23cf2ec..8aef96e18 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -23,6 +23,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -64,6 +65,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择包装规格', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 058db56ef..3d4e61e40 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -109,7 +109,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
-      row['uom'] = val[0]['uom']
+      if(formField=='itemCode'){
+        //物料代码
+        row['uom'] = val[0]['uom']
+      }else if(formField=='packUnit'){
+        //包装规格1
+        row['packQty'] = val[0]['packQty']
+      }else if(formField=='secondPackUnit'){
+        //包装规格2
+        row['secondPackQty'] = val[0]['packQty']
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 178ae28f8..7203d1460 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -1,42 +1,45 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 
 import * as ProductionMainApi from '@/api/wms/productionMain'
-import { ProductionMain } from '@/views/wms/productionManage/productionplan/productionMain/productionMain.data'
+import {
+  ProductionMain
+} from '@/views/wms/productionManage/productionplan/productionMain/productionMain.data'
 
 import * as WorkshopApi from '@/api/wms/workshop'
-import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import {Workshop} from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 
 import * as ProductionlineApi from '@/api/wms/productionline'
-import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import {
+  Productionline
+} from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
 
 import * as ShiftApi from '@/api/wms/shift'
-import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import {Shift} from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
 
 import * as TeamApi from '@/api/wms/team'
-import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import {Team} from '@/views/wms/basicDataManage/orderManage/team/team.data'
 
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 // import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
-
 // import * as BomApi from '@/api/wms/bom'
-import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+import {Bom} from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 
 import * as WorkStationApi from '@/api/wms/workstation'
-import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+import {Workstation} from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
 
-import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+import * as getPlansettingApi from '@/api/wms/plansetting/index'
 
-const { t } = useI18n() // 国际化
+const {t} = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'PreparetoissuePlan'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'PreparetoissuePlan'
 }
- const data = await getPlansettingApi.getPlansettingPage(queryParams)
- const plansettingData =data?.list[0]||{}
+const data = await getPlansettingApi.getPlansettingPage(queryParams)
+const plansettingData = data?.list[0] || {}
 
 /**
  * @returns {Array} 备料计划主表
@@ -63,7 +66,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isSearch: true,
-    isForm:false,
+    isForm: false,
     form: {
       value: '1',
       componentProps: {
@@ -182,7 +185,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -203,7 +206,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -228,12 +231,18 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: ProductionMain.allSchemas, // 查询弹窗所需类
         searchPage: ProductionMainApi.getProductionMainPage, // 查询弹窗所需分页方法
         searchCondition: [{
-          key:'status',
-          value:'6',
+          key: 'status',
+          value: '6',
+          isMainValue: false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
           isMainValue: false
-        },{
-          key:'available',
-          value:'TRUE',
+        },
+        {
+          key: 'planType',
+          value: 'predict',
           isMainValue: false
         }]
       }
@@ -290,7 +299,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -311,7 +320,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -332,7 +341,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -362,7 +371,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -395,7 +404,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -428,31 +437,31 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const PreparetoissueMainRules = reactive({
   workshop: [
-    { required: true, message: '请选择车间', trigger: 'change' }
+    {required: true, message: '请选择车间', trigger: 'change'}
   ],
   prodLine: [
-    { required: true, message: '请选择生产线', trigger: 'change' }
+    {required: true, message: '请选择生产线', trigger: 'change'}
   ],
   shift: [
-    { required: true, message: '请选择班次', trigger: 'change' }
+    {required: true, message: '请选择班次', trigger: 'change'}
   ],
   team: [
-    { required: true, message: '请选择班组', trigger: 'change' }
+    {required: true, message: '请选择班组', trigger: 'change'}
   ],
   planDate: [
-    { required: true, message: '请输入计划日期', trigger: 'change' }
+    {required: true, message: '请输入计划日期', trigger: 'change'}
   ],
   available: [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    {required: true, message: '请选择是否可用', trigger: 'change'}
   ],
   status: [
-    { required: true, message: '请选择状态', trigger: 'change' }
+    {required: true, message: '请选择状态', trigger: 'change'}
   ],
   businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
+    {required: true, message: '请输入业务类型', trigger: 'blur'}
   ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  remark: [
+    {max: 50, message: '不得超过50个字符', trigger: 'blur'}
   ],
 })
 
@@ -477,44 +486,44 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
         searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
         searchCondition: [{
-          key:'productionLineCode',
-          value:'prodLine',
+          key: 'productionLineCode',
+          value: 'prodLine',
           message: '请填写生产线代码！',
           isMainValue: true
-        },{
-          key:'workshopCode',
-          value:'workshop',
+        }, {
+          key: 'workshopCode',
+          value: 'workshop',
           message: '请填写车间代码！',
           isMainValue: true
-        },{
-          key:'available',
-          value:'TRUE',
+        }, {
+          key: 'available',
+          value: 'TRUE',
           isMainValue: false
         }]
       }
     },
-    tableForm:{
+    tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '工位信息', // 查询弹窗标题
-        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productionLineCode',
-          value:'prodLine',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        },{
-          key:'workshopCode',
-          value:'workshop',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },{
-          key:'available',
-          value:'TRUE',
-          isMainValue: false
-        }]
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '工位信息', // 查询弹窗标题
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'productionLineCode',
+        value: 'prodLine',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      }, {
+        key: 'workshopCode',
+        value: 'workshop',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }, {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
     },
   },
   {
@@ -534,14 +543,14 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法
         searchCondition: [{
-          key:'productionLineCode',
-          value:'prodLine',
+          key: 'productionLineCode',
+          value: 'prodLine',
           message: '请填写生产线代码！',
           isMainValue: true
         }]
       }
     },
-    tableForm:{
+    tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
@@ -549,8 +558,8 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
       searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法
       searchCondition: [{
-        key:'productionLineCode',
-        value:'prodLine',
+        key: 'productionLineCode',
+        value: 'prodLine',
         message: '请填写生产线代码！',
         isMainValue: true
       }]
@@ -566,7 +575,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
     },
-    tableForm:{
+    tableForm: {
       type: 'InputNumber',
       min: 1,
       precision: 6
@@ -589,7 +598,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       type: 'Select',
       disabled: true
     },
@@ -607,7 +616,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
-    tableForm:{
+    tableForm: {
       disabled: true
     },
   },
@@ -632,7 +641,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -678,7 +687,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -724,7 +733,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -745,7 +754,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     hiddenInMain: true,
-    tableForm:{
+    tableForm: {
       type: 'Select',
       default: 'TRUE'
     },
@@ -760,42 +769,42 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '操作',
-    hiddenInMain:true,
+    hiddenInMain: true,
     field: 'action',
     isDetail: false,
-    isForm: false ,
+    isForm: false,
     table: {
       width: 150,
       fixed: 'right'
     },
-    isTableForm:false,
+    isTableForm: false,
   }
 ]))
 
 //表单校验
 export const PreparetoissueDetailRules = reactive({
   available: [
-    { required: true, message: '请选择是否可用', trigger: 'blur' }
+    {required: true, message: '请选择是否可用', trigger: 'blur'}
   ],
   uom: [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
+    {required: true, message: '请选择计量单位', trigger: 'change'}
   ],
   planQty: [
-    { required: true, message: '请输入计划数量', trigger: 'blur' }
+    {required: true, message: '请输入计划数量', trigger: 'blur'}
   ],
   number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
+    {required: true, message: '请输入单据号', trigger: 'blur'}
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    {required: true, message: '请选择物料代码', trigger: 'change'}
   ],
   workStation: [
-    { required: true, message: '请选择工位', trigger: 'change' }
+    {required: true, message: '请选择工位', trigger: 'change'}
   ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  remark: [
+    {max: 50, message: '不得超过50个字符', trigger: 'blur'}
   ],
-  dueTime:  [
-    { required: true, message: '请选择截止时间', trigger: 'change' }
+  dueTime: [
+    {required: true, message: '请选择截止时间', trigger: 'change'}
   ]
 })
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
index 1b0427298..333e11c55 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
@@ -91,7 +91,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: QadProductionPlanMainApi.getQadProductionPlanMainPage // 分页接口
+  getListApi: QadProductionPlanMainApi.getQadProductionPlanDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
index 01a9d1b4a..93884b7a8 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const QadProductionPlanMainRules = reactive({
@@ -9,35 +9,31 @@ export const QadProductionPlanMainRules = reactive({
 })
 
 export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '顺序',
-    field: 'displayOrder',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
   {
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    table: {
+      width: 350,
+    }
   },
   {
-    label: '车间',
-    field: 'workshop',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150,
+    }
   },
   {
-    label: '生产线',
-    field: 'productionLine',
+    label: '计划数量',
+    field: 'planQty',
     sort: 'custom',
-    isSearch: true,
   },
   {
-    label: '班次',
-    field: 'shift',
+    label: '生产线',
+    field: 'productionLine',
     sort: 'custom',
     isSearch: true,
   },
@@ -50,7 +46,7 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划日期',
     field: 'planDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -59,11 +55,6 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '明细列表',
-    field: 'details',
-    sort: 'custom',
-  },
   {
     label: '计划类型',
     field: 'planType',
@@ -80,33 +71,33 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'SelectV2'
     },
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '订单号',
-    field: 'woNumber',
-    sort: 'custom',
-  },
-  {
-    label: '订单行',
-    field: 'woLine',
-    sort: 'custom',
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '是否可用',
+  //   field: 'available',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
+  // {
+  //   label: '状态',
+  //   field: 'status',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
+  // {
+  //   label: '订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  // },
   // {
   //   label: '操作',
   //   field: 'action',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 33c1ce108..3533aaab0 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -15,15 +15,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180,
-    },
-    isSearch: true
-  },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -31,6 +22,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1,
     isSearch: true
   },
   {
@@ -40,8 +32,38 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180,
     },
+    sortTableDefault:2,
     isForm: false
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sortTableDefault:10,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    isSearch: true
+  },
   {
     label: '订单号',
     field: 'poNumber',
@@ -541,6 +563,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '订单行',
@@ -550,6 +573,22 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '物流收货单号',
+    field: 'recvBillNum',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '单据号',
     field: 'number',
@@ -566,6 +605,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    sortTableDefault:8,
   },
   {
     label: '供应商代码',
@@ -579,10 +619,48 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    sortTableDefault:3,
     table: {
       width: 150
     },
   },
+  {
+    label: '物料描述',
+    field: 'itemDesc',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货时间',
+    field: 'planArriveTime',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
   {
     label: '物料名称',
     field: 'itemName',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index d2557e079..190f3d517 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -409,6 +409,11 @@ const handleImport = () => {
   /** 添加/修改操作 */
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
+    if(type=='update'){
+      SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
+    }else{
+      SupplierinvoiceRequestMainRules.invoiceTime[0].required = false
+    }
     if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator)
     // 校验是否可以开票
     SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then(res => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index a5ca1b66f..eb15f29d3 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -765,6 +765,9 @@ export const SupplierinvoiceRequestMainRules = reactive({
   supplierCode: [
     { required: true, message: '请选择供应商代码', trigger: 'change' }
   ],
+  invoiceTime:[
+    { required: false, message: '请选择发票日期', trigger: 'blur' }
+  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],