diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 297908077..36dd09bfa 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -54,30 +54,20 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '生产计划单号',
-    field: 'productionPlanNumber',
+    label: '状态',
+    field: 'status',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm:false,
     form: {
-      labelMessage: '同时影响车间 生产线 班组 班次',
+      value: '1',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产计划', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '生产计划信息', // 查询弹窗标题
-        searchAllSchemas: ProductionMain.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionMainApi.getProductionMainPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'status',
-          value:'6',
-          isMainValue: false
-        },{
-          key:'available',
-          value:'TRUE',
-          isMainValue: false
-        }] 
+        disabled: true
       }
     }
   },
@@ -119,25 +109,6 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '班次',
-    field: 'shift',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选班次', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '班次信息', // 查询弹窗标题
-        searchAllSchemas: Shift.allSchemas, // 查询弹窗所需类
-        searchPage: ShiftApi.getShiftPage // 查询弹窗所需分页方法
-      }
-    }
-  },
   {
     label: '班组',
     field: 'team',
@@ -158,20 +129,21 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '状态',
-    field: 'status',
+    label: '班次',
+    field: 'shift',
     sort: 'custom',
     table: {
       width: 150
     },
-    dictType: DICT_TYPE.PLAN_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isForm:false,
     form: {
-      value: '1',
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选班次', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '班次信息', // 查询弹窗标题
+        searchAllSchemas: Shift.allSchemas, // 查询弹窗所需类
+        searchPage: ShiftApi.getShiftPage // 查询弹窗所需分页方法
       }
     }
   },
@@ -238,6 +210,35 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    form: {
+      labelMessage: '同时影响车间 生产线 班组 班次',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产计划', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '生产计划信息', // 查询弹窗标题
+        searchAllSchemas: ProductionMain.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionMainApi.getProductionMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'status',
+          value:'6',
+          isMainValue: false
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -253,7 +254,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -274,6 +275,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       value: 'Issue',
       componentProps: {
@@ -287,7 +289,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -308,7 +310,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -329,7 +331,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -356,6 +358,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -374,6 +377,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -383,6 +387,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -405,6 +410,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -454,6 +460,63 @@ export const PreparetoissueMainRules = reactive({
  * @returns {Array} 备料计划子表
  */
 export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工位',
+    field: 'workStation',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: 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
+        }] 
+      }
+    },
+    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
+        }] 
+    },
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -541,63 +604,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     },
   },
-  {
-    label: '工位',
-    field: 'workStation',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: 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
-        }] 
-      }
-    },
-    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
-        }] 
-    },
-  },
+  
   {
     label: '截止时间',
     field: 'dueTime',
@@ -609,6 +616,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     tableForm: {
       type: 'FormDateTime',
       dateFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -631,6 +639,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       componentProps: {
         disabled: true
@@ -645,6 +654,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -657,6 +667,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -676,6 +687,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
   },
@@ -686,6 +698,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
   },
@@ -700,6 +713,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -723,6 +737,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     tableForm:{
       type: 'Select',
       default: 'TRUE'