diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index bca93fa19..150705354 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -52,6 +52,18 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm:false,
+  },
   {
     label: '客户代码',
     field: 'customerCode',
@@ -63,6 +75,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择客户代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -77,6 +90,51 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '客户月台',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: true,
+    // tableForm:{
+    //   isInpuFocusShow: true, // 开启查询弹窗
+    //   searchListPlaceholder: '请选择客户月台代码',
+    //   searchField: 'code',
+    //   searchTitle: '客户月台基础信息',
+    //   searchAllSchemas: Customerdock.allSchemas,
+    //   searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock,
+    //   searchCondition: [{
+    //     key: 'available',
+    //     value: 'TRUE',
+    //   },{
+    //     key: 'customerCode',
+    //     value: 'customerCode',
+    //     isMainValue: true
+    // }]
+    // },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择客户月台代码',
+        searchField: 'code',
+        searchTitle: '客户月台基础信息',
+        searchAllSchemas: Customerdock.allSchemas,
+        searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'customerCode',
+          value: 'customerCode',
+          isMainValue: true
+        }]
+      }
+    },
+  },
   {
     label: '发货类型',
     field: 'deliverType',
@@ -116,16 +174,9 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
     isTable: false,
   },
+  
   {
     label: '创建时间',
     field: 'createTime',
@@ -137,6 +188,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -154,6 +206,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -167,6 +220,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -187,6 +241,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -196,25 +251,13 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    dictType: DICT_TYPE.PLAN_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isForm:false,
-  },
   {
     label: '是否可用',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -229,12 +272,21 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
   {
     label: '自动提交',
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm: false,
     sort: 'custom',
     table: {
@@ -255,7 +307,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm: false,
     sort: 'custom',
     table: {
@@ -276,7 +328,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm: false,
     sort: 'custom',
     table: {
@@ -299,6 +351,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -312,6 +365,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -413,6 +467,35 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isTableForm: false,
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择客户代码',
+      searchField: 'code',
+      searchTitle: '客户信息',
+      searchAllSchemas: Customer.allSchemas,
+      searchPage: CustomerApi.getCustomerPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择客户代码',
+        searchField: 'code',
+        searchTitle: '客户信息',
+        searchAllSchemas: Customer.allSchemas,
+        searchPage: CustomerApi.getCustomerPage
+      }
+    }
+  },
   {
     label: '客户月台',
     field: 'customerDockCode',
@@ -420,6 +503,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
     tableForm:{
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择客户月台代码',
@@ -456,30 +540,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '项目',
-    field: 'project',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -488,6 +548,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码',
       searchField: 'itemCode',
@@ -524,6 +585,55 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'  
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -570,6 +680,34 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '项目',
+    field: 'project',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  
+  
   {
     label: '备注',
     field: 'remark',
@@ -577,6 +715,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -589,6 +728,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -607,6 +747,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
@@ -617,6 +758,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -630,26 +772,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-      type: 'Select'  
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -661,6 +784,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -679,6 +803,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
@@ -687,7 +812,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -712,6 +837,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
       fixed: 'right'
     },
+    hiddenInMain: true,
     isTableForm:false,
   }
 ]))