diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
index 6103de28c..b414552ba 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
@@ -6,74 +6,56 @@ import { dateFormatter } from '@/utils/formatTime'
  */
 export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '申请单号',
-    field: 'requestNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      fixed: 'left'
     },
     isSearch: true,
   },
   {
-    label: '承运商',
-    field: 'carrierCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '运输方式',
-    field: 'transferMode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
     isSearch: true,
-  },
-  {
-    label: '车牌号',
-    field: 'vehiclePlateNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
+    label: '承运商',
+    field: 'carrierCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
+    label: '运输方式',
+    field: 'transferMode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
-    label: '到月台代码',
-    field: 'toDockCode',
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -119,18 +101,6 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '过期时间',
     field: 'expiredTime',
@@ -152,158 +122,96 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
-  // {
-  //   label: '状态',
-  //   field: 'jobStageStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
-    label: '优先级',
-    field: 'priority',
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '优先级增量',
-    field: 'priorityIncrement',
+    label: '从库位类型范围',
+    field: 'fromLocationTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '部门',
-    field: 'departmentCode',
+    label: '到库位类型范围',
+    field: 'toLocationTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '承接人',
-    field: 'acceptUserId',
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '完成人',
-    field: 'completeUserId',
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '完成时间',
-    field: 'completeTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
-    isTable: true,
+    label: '到月台代码',
+    field: 'toDockCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
-    isTable: true,
+    label: '优先级',
+    field: 'priority',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '优先级增量',
+    field: 'priorityIncrement',
     sort: 'custom',
     table: {
-      width: 150,
-      fixed: 'left'
+      width: 150
     },
-    isSearch: true,
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
     label: '业务类型',
@@ -314,36 +222,16 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
@@ -539,6 +427,118 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',
@@ -617,137 +617,137 @@ export const TransferreceiptJobMainRules = reactive({
  */
 export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '从货主代码',
+    field: 'fromOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '到货主代码',
+    field: 'toOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
index bdfc48668..82548d152 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
@@ -5,6 +5,16 @@ import { dateFormatter } from '@/utils/formatTime'
  * @returns {Array} 调拨入库记录主表
  */
 export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -55,83 +65,6 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到月台代码',
-    field: 'toDockCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '执行时间',
     field: 'executeTime',
@@ -213,17 +146,25 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '部门',
-    field: 'departmentCode',
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位类型范围',
+    field: 'fromLocationTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -232,14 +173,54 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '到库位类型范围',
+    field: 'toLocationTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150,
-      fixed: 'left'
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
     },
-    isSearch: true
   },
   {
     label: '业务类型',
@@ -250,16 +231,27 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
@@ -285,6 +277,14 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '代码',
   //   field: 'code',
@@ -378,57 +378,60 @@ export const TransferreceiptRecordMainRules = reactive({
  */
 export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '从包装号',
-    field: 'fromPackingNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从器具号',
-    field: 'fromContainerNumber',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到器具号',
-    field: 'toContainerNumber',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从批次',
-    field: 'fromBatch',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到批次',
-    field: 'toBatch',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -437,178 +440,186 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '从批次',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '到批次',
+    field: 'toBatch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库位组代码',
-    field: 'fromLocationGroupCode',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库区代码',
-    field: 'fromAreaCode',
+    label: '到包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '从器具号',
+    field: 'fromContainerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '到器具号',
+    field: 'toContainerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库区代码',
-    field: 'toAreaCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '从库区代码',
+    field: 'fromAreaCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '到库区代码',
+    field: 'toAreaCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '从货主代码',
+    field: 'fromOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '到货主代码',
+    field: 'toOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
     form: {
-      component: 'InputNumber',
-    }
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
@@ -622,17 +633,6 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   //     width: 150
   //   },
   // },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
 ]))
 
 //表单校验
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index f7c6928ac..6012f23e5 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -21,6 +21,35 @@ const userDept = userStore.userSelfInfo.dept
  * @returns {Array} 调拨入库申请主表
  */
 export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '承运商',
     field: 'carrierCode',
@@ -46,6 +75,46 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -109,17 +178,6 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isSearch: true,
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-  },
   {
     label: '业务类型',
     field: 'businessType',
@@ -134,85 +192,6 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
   {
     label: '部门',
     field: 'departmentCode',
@@ -228,52 +207,13 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    isTable: false,
   },
   {
     label: '自动提交',
@@ -355,6 +295,66 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
   {
     label: '操作',
     field: 'action',
@@ -412,183 +412,173 @@ export const TransferreceiptRequestMainRules = reactive({
  */
 export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false
   },
   {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
-    isTableForm: false,
-    isForm: false
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '从货主代码',
+    field: 'fromOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '到货主代码',
+    field: 'toOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
     },
+    isTableForm: false,
+    isForm: false
   },
   {
-    label: '最后更新者',
-    field: 'updater',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
@@ -618,6 +608,16 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '操作',
     field: 'action',