diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index beeac40c4..cb38125b5 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -13,6 +13,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true,
   },
   {
@@ -22,7 +23,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true,
+    isTable: false,
   },
   {
     label: '供应商代码',
@@ -31,7 +32,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isTable: false,
   },
   {
     label: '从仓库代码',
@@ -40,6 +41,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -60,6 +62,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '要求截止时间',
@@ -80,6 +83,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   // {
   //   label: '状态',
@@ -100,6 +104,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -114,12 +119,12 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.JOB_STATUS,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:1,
   },
   {
     label: '优先级',
@@ -128,6 +133,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
     }
@@ -139,6 +145,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
     }
@@ -150,6 +157,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接人',
@@ -158,6 +166,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接时间',
@@ -170,6 +179,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -186,6 +196,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '完成时间',
@@ -198,6 +209,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -212,7 +224,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -223,7 +235,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -236,6 +248,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -244,6 +257,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -256,6 +270,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -272,6 +287,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到仓库代码',
@@ -280,6 +296,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -288,6 +305,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区代码范围',
@@ -296,13 +314,14 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '自动完成',
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -321,7 +340,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -340,7 +359,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -359,7 +378,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -378,7 +397,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -397,7 +416,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -416,7 +435,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -435,7 +454,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -454,7 +473,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -473,7 +492,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -494,6 +513,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '来源库位',
@@ -502,6 +522,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '目标库位',
@@ -510,6 +531,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '数量',
@@ -518,6 +540,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '单位',
@@ -529,6 +552,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '操作',
@@ -608,6 +632,26 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortTableDefault:5,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
   },
   {
     label: '器具号',
@@ -616,6 +660,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '批次',
@@ -624,6 +669,9 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:3,
+    sortTableDefault:4,
   },
   {
     label: '库存状态',
@@ -637,12 +685,13 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '订单号',
+    label: '采购订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
     label: '订单行',
@@ -651,6 +700,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
     label: '从库位代码',
@@ -659,6 +709,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '到库位代码',
@@ -667,6 +718,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '物料代码',
@@ -675,6 +727,9 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortSearchDefault:2,
+    isSearch: true,
+    sortTableDefault:3,
   },
   {
     label: '物料名称',
@@ -683,6 +738,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
     label: '物料描述1',
@@ -691,6 +747,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '物料描述2',
@@ -699,6 +756,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '项目代码',
@@ -707,6 +765,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '数量',
@@ -717,7 +776,8 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain: true,
   },
   {
     label: '计量单位',
@@ -729,6 +789,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:6,
   },
   {
     label: '单据号',
@@ -737,6 +798,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
   },
   {
     label: '备注',
@@ -745,6 +807,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '从货主代码',
@@ -753,6 +816,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '到货主代码',
@@ -761,6 +825,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -773,6 +838,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -789,6 +855,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '操作',
@@ -898,6 +965,7 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    sortTableDefault:10,
     form: {
       componentProps: {
         disabled:true
@@ -946,6 +1014,7 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    sortTableDefault:11,
     form: {
       componentProps: {
         disabled:true
@@ -962,6 +1031,7 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    sortTableDefault:11,
     form: {
       componentProps: {
         disabled:true
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index 15b95559c..39a2b2d4e 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -13,8 +13,21 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -22,7 +35,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '任务单号',
@@ -31,6 +44,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
   },
   {
     label: '供应商代码',
@@ -39,7 +53,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -48,6 +62,8 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+
   },
   {
     label: '入库事务类型',
@@ -56,6 +72,8 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+
   },
   {
     label: '执行时间',
@@ -68,6 +86,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -84,6 +103,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -109,6 +129,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -129,6 +150,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -145,13 +167,14 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -164,6 +187,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -172,6 +196,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -180,6 +205,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -192,6 +218,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -216,6 +243,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -224,13 +252,14 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -243,13 +272,14 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -262,14 +292,14 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '是否可用',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -283,6 +313,24 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '包装号',   //  子表数据 只是为了展示
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '批次',     //  子表数据 只是为了展示
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
 ]))
 
 //表单校验
@@ -348,6 +396,8 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '到包装号',
@@ -356,6 +406,38 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
   },
   {
     label: '从批次',
@@ -364,6 +446,9 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortSearchDefault:3,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '到批次',
@@ -372,6 +457,9 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortSearchDefault:4,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '库存状态',
@@ -385,12 +473,13 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '订单号',
+    label: '采购订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
     label: '订单行',
@@ -399,6 +488,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
     label: '从货主代码',
@@ -407,6 +497,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '从库位代码',
@@ -415,6 +506,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '从库位组代码',
@@ -423,6 +515,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '从库区代码',
@@ -431,6 +524,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到货主代码',
@@ -439,6 +533,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库位代码',
@@ -447,6 +542,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '到库位组代码',
@@ -455,6 +551,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库区代码',
@@ -463,6 +560,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -471,6 +569,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -479,6 +578,18 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:2,
+    sortTableDefault:4,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
   },
   {
     label: '备注',
@@ -487,6 +598,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -499,6 +611,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -515,14 +628,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    hiddenInMain:true,
   },
   {
     label: '物料描述1',
@@ -531,6 +637,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述2',
@@ -539,6 +646,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -547,6 +655,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -555,6 +664,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
     }
@@ -569,6 +679,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   // {
   //   label: '代码',
@@ -588,6 +699,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   // {
   //   label: '任务明细ID',
@@ -604,6 +716,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到器具号',
@@ -612,6 +725,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '操作',
@@ -720,6 +834,7 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    isSearch: true,
     form: {
       componentProps: {
         disabled:true
@@ -736,6 +851,7 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     table: {
       width: 150
     },
+    isSearch: true,
     form: {
       componentProps: {
         disabled:true
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 96a8ec90e..13245d9e2 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -60,6 +60,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortSearchDefault:1,
   },
   // {
   //   label: '从仓库代码',
@@ -75,7 +76,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -89,6 +90,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -98,7 +100,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isTable: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -118,6 +120,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     tableForm: {
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择仓库代码',
@@ -156,6 +159,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     tableForm: {
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择仓库代码',
@@ -194,7 +198,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -207,6 +211,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -225,6 +230,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -238,6 +244,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -261,6 +268,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -278,6 +286,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -299,8 +308,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -318,7 +326,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -332,6 +340,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -339,7 +348,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -360,7 +369,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -381,7 +390,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -427,7 +436,36 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 300,
       fixed: 'right'
     },
-  }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    sortSearchDefault:6,
+    sortTableDefault:1100,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
 ]))
 
 //表单校验
@@ -477,6 +515,9 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    isSearch: true,
+    sortTableDefault:6,
+    sortSearchDefault:4,
   },
   {
     label: '器具号',
@@ -487,6 +528,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    hiddenInMain:true,
   },
   {
     label: '批次',
@@ -495,6 +537,9 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortTableDefault:5,
+    sortSearchDefault:3,
   },
   {
     label: '库存状态',
@@ -517,6 +562,9 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
+    sortSearchDefault:2,
+    sortTableDefault:3,
     tableForm: {
       disabled: true,
       isInpuFocusShow: true,
@@ -546,17 +594,19 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
     tableForm: {
       type: 'Select'
     }
   },
   {
-    label: '订单号',
+    label: '采购订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:1,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -584,6 +634,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:2,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -611,6 +662,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:5,
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择从库位代码',
@@ -643,7 +696,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true
       }
-    }
+    },
+    hiddenInMain:true,
   },
 
   {
@@ -653,6 +707,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -674,6 +729,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -684,6 +740,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -694,6 +751,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:4,
     isTableForm: false,
     isForm: false
   },
@@ -704,6 +762,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -714,6 +773,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -724,6 +784,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -734,6 +795,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -756,7 +818,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    hiddenInMain:true,
   },
   {
     label: '到货主代码',
@@ -765,6 +828,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },