From c2c7eb00950f93ee71344178f9d326555bdd9c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com>
Date: Thu, 30 Nov 2023 09:12:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedreceiptJobMain.data.ts           | 428 ++++++++--------
 .../unplannedreceiptRecordMain/index.vue      |  38 +-
 .../unplannedreceiptRecordMain.data.ts        | 334 ++++++------
 .../unplannedreceiptRequestMain.data.ts       | 478 +++++++++---------
 4 files changed, 639 insertions(+), 639 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
index c3c0a9649..f0aa07671 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@@ -6,29 +6,35 @@ import { dateFormatter } from '@/utils/formatTime'
  */
 export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '申请单号',
-    field: 'requestNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      fixed: 'left'
     },
     isSearch: true,
   },
   {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '申请时间',
@@ -70,18 +76,6 @@ export const UnplannedreceiptJobMain = 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',
@@ -103,28 +97,16 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
   },
   {
-    label: '最后更新者',
-    field: 'updater',
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
     sort: 'custom',
     table: {
       width: 150
@@ -138,92 +120,6 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '优先级',
-    field: 'priority',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '优先级增量',
-    field: 'priorityIncrement',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '承接人',
-    field: 'acceptUserId',
-    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',
-    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',
@@ -248,54 +144,46 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '优先级',
+    field: 'priority',
     sort: 'custom',
     table: {
-      width: 150,
-      fixed: 'left'
+      width: 150
     },
-    isSearch: true,
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '业务类型',
-    field: 'businessType',
+    label: '优先级增量',
+    field: 'priorityIncrement',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '业务类型',
+    field: 'businessType',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '部门',
+    field: 'departmentCode',
     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: 'remark',
     sort: 'custom',
     table: {
       width: 150
@@ -491,6 +379,118 @@ export const UnplannedreceiptJobMain = 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',
@@ -560,130 +560,122 @@ export const UnplannedreceiptJobMainRules = reactive({
  */
 export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '替代批次',
-    field: 'altBatch',
+    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: 'reason',
-    dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
-    dictClass: 'string',
-    isTable: true,
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '货主代码',
-    field: 'ownerCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     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: 'altBatch',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -692,24 +684,24 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '货主代码',
+    field: 'ownerCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: '到货日期',
+    field: 'arriveDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -728,16 +720,8 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
+    label: '生产日期',
+    field: 'produceDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -756,8 +740,8 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '生产日期',
-    field: 'produceDate',
+    label: '过期日期',
+    field: 'expireDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -776,8 +760,16 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '过期日期',
-    field: 'expireDate',
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -795,6 +787,14 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
 ]))
 
 //表单校验
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
index 8eca3e66b..94539156b 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="TransferreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="UnplannedreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,7 +11,7 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="TransferreceiptRecordMain.allSchemas"
+      :allSchemas="UnplannedreceiptRecordMain.allSchemas"
     />
 
   <!-- 列表 -->
@@ -42,10 +42,10 @@
   <BasicForm
     ref="formRef"
     @success="getList"
-    :rules="TransferreceiptRecordMainRules"
-    :formAllSchemas="TransferreceiptRecordMain.allSchemas"
-    :tableAllSchemas="TransferreceiptRecordDetail.allSchemas"
-    :tableFormRules="TransferreceiptRecordDetailRules"
+    :rules="UnplannedreceiptRecordMainRules"
+    :formAllSchemas="UnplannedreceiptRecordMain.allSchemas"
+    :tableAllSchemas="UnplannedreceiptRecordDetail.allSchemas"
+    :tableFormRules="UnplannedreceiptRecordDetailRules"
     :isBusiness="true"
   />
 
@@ -53,22 +53,22 @@
   <Detail
     ref="detailRef"
     :isBasic="false"
-    :allSchemas="TransferreceiptRecordMain.allSchemas"
-    :detailAllSchemas="TransferreceiptRecordDetail.allSchemas"
-    :detailAllSchemasRules="TransferreceiptRecordDetailRules"
-    :apiPage="TransferreceiptRecordDetailApi.getTransferreceiptRecordDetailPage"
+    :allSchemas="UnplannedreceiptRecordMain.allSchemas"
+    :detailAllSchemas="UnplannedreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="UnplannedreceiptRecordDetailRules"
+    :apiPage="UnplannedreceiptRecordDetailApi.getUnplannedreceiptRecordDetailPage"
   />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { TransferreceiptRecordMain,TransferreceiptRecordMainRules,TransferreceiptRecordDetail,TransferreceiptRecordDetailRules } from '@/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data'
-import * as TransferreceiptRecordMainApi from '@/api/wms/transferreceiptRecordMain'
-import * as TransferreceiptRecordDetailApi from '@/api/wms/transferreceiptRecordDetail'
+import { UnplannedreceiptRecordMain,UnplannedreceiptRecordMainRules,UnplannedreceiptRecordDetail,UnplannedreceiptRecordDetailRules } from '@/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data'
+import * as UnplannedreceiptRecordMainApi from '@/api/wms/unplannedreceiptRecordMain'
+import * as UnplannedreceiptRecordDetailApi from '@/api/wms/unplannedreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 // 调拨入库记录主
-defineOptions({ name: 'TransferreceiptRecordMain' })
+defineOptions({ name: 'UnplannedreceiptRecordMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -76,7 +76,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(TransferreceiptRecordMain.allSchemas.tableColumns)
+const tableColumns = ref(UnplannedreceiptRecordMain.allSchemas.tableColumns)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -84,7 +84,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: TransferreceiptRecordMainApi.getTransferreceiptRecordMainPage // 分页接口
+  getListApi: UnplannedreceiptRecordMainApi.getUnplannedreceiptRecordMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -92,7 +92,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:${baseURL}:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-record-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -141,8 +141,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await TransferreceiptRecordMainApi.exportTransferreceiptRecordMain(setSearchParams)
-    download.excel(data, '调拨入库记录主.xlsx')
+    const data = await UnplannedreceiptRecordMainApi.exportUnplannedreceiptRecordMain(setSearchParams)
+    download.excel(data, '计划外入库记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index d68f506e3..3e5445519 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -6,17 +6,18 @@ import { dateFormatter } from '@/utils/formatTime'
  */
 export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '申请单号',
-    field: 'requestNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      fixed: 'left'
     },
     isSearch: true
   },
   {
-    label: '任务单号',
-    field: 'jobNumber',
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -24,51 +25,17 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true
   },
   {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
+    label: '任务单号',
+    field: 'jobNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true
   },
   {
-    label: '执行时间',
-    field: 'executeTime',
+    label: '申请时间',
+    field: 'requestTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -87,8 +54,8 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '生效日期',
-    field: 'activeDate',
+    label: '截止时间',
+    field: 'dueTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -107,8 +74,8 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '申请时间',
-    field: 'requestTime',
+    label: '执行时间',
+    field: 'executeTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -127,8 +94,8 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '截止时间',
-    field: 'dueTime',
+    label: '生效日期',
+    field: 'activeDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -147,17 +114,17 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '部门',
-    field: 'departmentCode',
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
+    label: '到库位类型范围',
+    field: 'toLocationTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -166,14 +133,28 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
     sort: 'custom',
     table: {
-      width: 150,
-      fixed: 'left'
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
     },
-    isSearch: true
   },
   {
     label: '业务类型',
@@ -184,16 +165,27 @@ export const UnplannedreceiptRecordMain = 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
@@ -219,6 +211,14 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '代码',
   //   field: 'code',
@@ -302,6 +302,54 @@ export const UnplannedreceiptRecordMainRules = reactive({
  * @returns {Array} 计划外入库记录子表
  */
 export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '包装号',
     field: 'packingNumber',
@@ -319,8 +367,52 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -397,22 +489,6 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
   },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '到库位组代码',
     field: 'toLocationGroupCode',
@@ -441,38 +517,27 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '单价',
-    field: 'singlePrice',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '金额',
-    field: 'amount',
+    label: '货主代码',
+    field: 'ownerCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -522,60 +587,6 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
   },
-  {
-    label: '物品名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物品描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物品描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   // {
   //   label: '代码',
   //   field: 'code',
@@ -584,17 +595,6 @@ export const UnplannedreceiptRecordDetail = 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/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index d011dd204..a2804fd4c 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -25,38 +25,6 @@ const userDept = userStore.userSelfInfo.dept
  * @returns {Array} 计划外入库申请主表
  */
 export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    isForm: false,
-  },
   {
     label: '单据号',
     field: 'number',
@@ -69,59 +37,22 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     isSearch: true,
   },
   {
-    label: '业务类型',
-    field: 'businessType',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
     form: {
-      value: 'UnplannedReceipt',
+      value: '1',
       componentProps: {
         disabled: true
       }
-    },
-    isForm: false,
-  },
-  {
-    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: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
+    }
   },
   {
     label: '申请时间',
@@ -167,23 +98,18 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '部门',
-    field: 'departmentCode',
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      value: userDept.name,
-      componentProps: {
-        disabled: true
-      }
-    }
+    isForm: false,
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
+    label: '到库位类型范围',
+    field: 'toLocationTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -191,42 +117,46 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
+    isForm: false,
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
     },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
     form: {
-      component: 'DatePicker',
+      value: 'UnplannedReceipt',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        disabled: true
       }
     },
     isForm: false,
   },
   {
-    label: '最后更新者',
-    field: 'updater',
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    form: {
+      value: userDept.name,
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '自动提交',
@@ -308,6 +238,76 @@ export const UnplannedreceiptRequestMain = 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: {
+        style: {width:'100%'},
+        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',
@@ -355,6 +355,72 @@ export const UnplannedreceiptRequestMainRules = reactive({
  * @returns {Array} 计划外入库申请子表
  */
 export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '包装号',
     field: 'packingNumber',
@@ -394,8 +460,42 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -404,6 +504,21 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       disabled: true
     }
   },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    }
+  },
   {
     label: '替代批次',
     field: 'altBatch',
@@ -493,21 +608,6 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       valueFormat: 'x',
     }
   },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-      type: 'Select'
-    }
-  },
   {
     label: '到货主代码',
     field: 'toOwnerCode',
@@ -533,29 +633,14 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '单据号',
-    field: 'number',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
     isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isForm: false
   },
   {
     label: '备注',
@@ -566,16 +651,6 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     },
     isTable: false,
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -599,93 +674,8 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isForm: false
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '物品名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物品描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物品描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6,
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6,
-    },
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select'
-    }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
@@ -715,6 +705,16 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '操作',
     field: 'action',