diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts
index 5be01283e..6db96994b 100644
--- a/src/api/wms/location/index.ts
+++ b/src/api/wms/location/index.ts
@@ -34,6 +34,16 @@ export const getLocationPage = async (params) => {
     return await request.get({ url: `/wms/location/page`, params })
   }
 }
+// 查询库位列表
+export const getLocationPageOnlineSettlement = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/location/seniorOnlineSettlement', data })
+  } else {
+    return await request.get({ url: `/wms/location/pageOnlineSettlement`, params })
+  }
+}
 // 校验库位
 export const verifyLocation = async (params) => {
   return await request.get({ url: `/wms/location/listLocationByCode`, params })
diff --git a/src/api/wms/onlinesettlementInfo/index.ts b/src/api/wms/onlinesettlementInfo/index.ts
new file mode 100644
index 000000000..c69e6fd4f
--- /dev/null
+++ b/src/api/wms/onlinesettlementInfo/index.ts
@@ -0,0 +1,79 @@
+import request from '@/config/axios'
+
+export interface OnlinesettlementInfoVO {
+  id: number
+  number: string
+  receiptRecordNumber: string
+  receiptDate: Date
+  outTransactionType: string
+  inTransactionType: string
+  supplierCode: string
+  supplierItemCode: string
+  poNumber: string
+  poLine: string
+  itemCode: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  packingNumber: string
+  batch: string
+  inventoryStatus: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  fromWarehouseCode: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  toWarehouseCode: string
+  settlementQty: number
+  settlementRecordNumber: string
+  settlementBusinessType: string
+  settlementDatetime: Date
+  concurrencyStamp: number
+  remark: string
+}
+
+// 查询上线结算记录信息新列表
+export const getOnlinesettlementInfoPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-info/senior', data })
+  } else {
+    return await request.get({ url: `/wms/onlinesettlement-info/page`, params })
+  }
+}
+
+// 查询上线结算记录信息新详情
+export const getOnlinesettlementInfo = async (id: number) => {
+  return await request.get({ url: `/wms/onlinesettlement-info/get?id=` + id })
+}
+
+// 新增上线结算记录信息新
+export const createOnlinesettlementInfo = async (data: OnlinesettlementInfoVO) => {
+  return await request.post({ url: `/wms/onlinesettlement-info/create`, data })
+}
+
+// 修改上线结算记录信息新
+export const updateOnlinesettlementInfo = async (data: OnlinesettlementInfoVO) => {
+  return await request.put({ url: `/wms/onlinesettlement-info/update`, data })
+}
+
+// 删除上线结算记录信息新
+export const deleteOnlinesettlementInfo = async (id: number) => {
+  return await request.delete({ url: `/wms/onlinesettlement-info/delete?id=` + id })
+}
+
+// 导出上线结算记录信息新 Excel
+export const exportOnlinesettlementInfo = async (params) => {
+  return await request.download({ url: `/wms/onlinesettlement-info/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/onlinesettlement-info/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/onlinesettlementInfoDetail/index.ts b/src/api/wms/onlinesettlementInfoDetail/index.ts
new file mode 100644
index 000000000..d1c8e6ba7
--- /dev/null
+++ b/src/api/wms/onlinesettlementInfoDetail/index.ts
@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+export interface OnlinesettlementInfoDetailVO {
+  id: number
+  number: string
+  masterId: number
+  settlementQty: number
+  settlementRecordNumber: string
+  settlementBusinessType: string
+  settlementDatetime: Date
+  concurrencyStamp: number
+  remark: string
+}
+
+// 查询上线结算记录信息新子表列表
+export const getOnlinesettlementInfoDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-info-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/onlinesettlement-info-detail/page`, params })
+  }
+}
+
+// 查询上线结算记录信息新子表详情
+export const getOnlinesettlementInfoDetail = async (id: number) => {
+  return await request.get({ url: `/wms/onlinesettlement-info-detail/get?id=` + id })
+}
+
+// 新增上线结算记录信息新子表
+export const createOnlinesettlementInfoDetail = async (data: OnlinesettlementInfoDetailVO) => {
+  return await request.post({ url: `/wms/onlinesettlement-info-detail/create`, data })
+}
+
+// 修改上线结算记录信息新子表
+export const updateOnlinesettlementInfoDetail = async (data: OnlinesettlementInfoDetailVO) => {
+  return await request.put({ url: `/wms/onlinesettlement-info-detail/update`, data })
+}
+
+// 删除上线结算记录信息新子表
+export const deleteOnlinesettlementInfoDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/onlinesettlement-info-detail/delete?id=` + id })
+}
+
+// 导出上线结算记录信息新子表 Excel
+export const exportOnlinesettlementInfoDetail = async (params) => {
+  return await request.download({ url: `/wms/onlinesettlement-info-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/onlinesettlement-info-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/settlementConfiguration/index.ts b/src/api/wms/settlementConfiguration/index.ts
new file mode 100644
index 000000000..6b7ef57ab
--- /dev/null
+++ b/src/api/wms/settlementConfiguration/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface SettlementConfigurationVO {
+  id: number
+  supplierCode: string
+  itemCode: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  remark: string
+  concurrencyStamp: number
+}
+
+// 查询上线结算配置列表
+export const getSettlementConfigurationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/settlement-configuration/senior', data })
+  } else {
+    return await request.get({ url: `/wms/settlement-configuration/page`, params })
+  }
+}
+
+// 查询上线结算配置详情
+export const getSettlementConfiguration = async (id: number) => {
+  return await request.get({ url: `/wms/settlement-configuration/get?id=` + id })
+}
+
+export const editSettlementConfiguration = async (id: number) => {
+  return await request.get({ url: `/wms/settlement-configuration/editView?id=` + id })
+}
+
+// 新增上线结算配置
+export const createSettlementConfiguration = async (data: SettlementConfigurationVO) => {
+  return await request.post({ url: `/wms/settlement-configuration/create`, data })
+}
+
+// 修改上线结算配置
+export const updateSettlementConfiguration = async (data: SettlementConfigurationVO) => {
+  return await request.put({ url: `/wms/settlement-configuration/update`, data })
+}
+
+// 删除上线结算配置
+export const deleteSettlementConfiguration = async (id: number) => {
+  return await request.delete({ url: `/wms/settlement-configuration/delete?id=` + id })
+}
+
+// 导出上线结算配置 Excel
+export const exportSettlementConfiguration = async (params) => {
+  return await request.download({ url: `/wms/settlement-configuration/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/settlement-configuration/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/settlementReport/index.ts b/src/api/wms/settlementReport/index.ts
new file mode 100644
index 000000000..814df0978
--- /dev/null
+++ b/src/api/wms/settlementReport/index.ts
@@ -0,0 +1,80 @@
+import request from '@/config/axios'
+
+export interface SettlementConfigurationVO {
+  id: number
+  supplierCode: string
+  itemCode: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  remark: string
+  concurrencyStamp: number
+}
+
+// 查询上线结算配置列表
+export const getSettlementReportPage = async (params) => {
+  // if (params.isSearch) {
+  //   delete params.isSearch
+  //   const data = {...params}
+  //   return await request.post({ url: '/wms/onlinesettlement-info/settlementInfoReport/senior', data })
+  // } else {
+    return await request.get({ url: `/wms/onlinesettlement-info/settlementInfoReport`, params })
+  // }
+}
+
+
+// 查询上线结算配置列表
+export const getSettlementReportBalance = async (params) => {
+  // if (params.isSearch) {
+  //   delete params.isSearch
+  //   const data = {...params}
+  //   return await request.post({ url: '/wms/onlinesettlement-info/settlementInfoReport/senior', data })
+  // } else {
+    return await request.get({ url: `/wms/onlinesettlement-info/settlementInfoReportBalance`, params })
+  // }
+}
+
+
+// 批量结算
+export const submitSettlementReport = async (data) => {
+  // if (params.isSearch) {
+  //   delete params.isSearch
+  //   const data = {...params}
+  //   return await request.post({ url: '/wms/onlinesettlement-info/settlementInfoReport/senior', data })
+  // } else {
+    return await request.post({ url: `/wms/onlinesettlement-info/settlementInfoSubmit`, data })
+  // }
+}
+
+// // 查询上线结算配置详情
+// export const getSettlementConfiguration = async (id: number) => {
+//   return await request.get({ url: `/wms/settlement-configuration/get?id=` + id })
+// }
+
+// export const editSettlementConfiguration = async (id: number) => {
+//   return await request.get({ url: `/wms/settlement-configuration/editView?id=` + id })
+// }
+
+// // 新增上线结算配置
+// export const createSettlementConfiguration = async (data: SettlementConfigurationVO) => {
+//   return await request.post({ url: `/wms/settlement-configuration/create`, data })
+// }
+
+// // 修改上线结算配置
+// export const updateSettlementConfiguration = async (data: SettlementConfigurationVO) => {
+//   return await request.put({ url: `/wms/settlement-configuration/update`, data })
+// }
+
+// // 删除上线结算配置
+// export const deleteSettlementConfiguration = async (id: number) => {
+//   return await request.delete({ url: `/wms/settlement-configuration/delete?id=` + id })
+// }
+
+// // 导出上线结算配置 Excel
+// export const exportSettlementConfiguration = async (params) => {
+//   return await request.download({ url: `/wms/settlement-configuration/export-excel`, params })
+// }
+
+// // 下载用户导入模板
+// export const importTemplate = () => {
+//   return request.download({ url: '/wms/settlement-configuration/get-import-template' })
+// }
\ No newline at end of file
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index fbc4bb175..3e61da23b 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -78,6 +78,7 @@
           <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail == 'InputString'" />
         </template>
       </Form>
+      <slot name="tableForm"></slot>
       <Tabs ref="tabRef" v-if="includeCollectionTable&&formType=='create'&&tableAllSchemas&&tableAllSchemas.tableFormColumns.find(item=>item.field == 'itemCode')" :tabsList="[{
         label: '明细',
         prop: 'TableForm'
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 0483631d5..361244e15 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -37,10 +37,11 @@
       />
     </ContentWrap>
     <template #footer>
-      <div class="flex items-center">
+      <slot name="footerActions"></slot>
+      <div class="flex items-center" v-if="!hiddenFooterActions">
         <slot :name="'selectionsActions'+formFieldRef" :selections="searchTableRef?searchTableRef.selections:[]"></slot>
         <el-button @click="submitForm" type="primary" :disabled="formLoading">{{ t(`ts.${'确 定'}`) }}</el-button>
-        <el-button @click="searchDialogVisible = false">{{ t(`ts.${'取 消'}`) }}</el-button>
+        <el-button @click="cancleClick">{{ t(`ts.${'取 消'}`) }}</el-button>
 
         <slot name="actions"></slot>
       </div>
@@ -64,7 +65,12 @@ const props = defineProps({
   isCheckStrictly:{
     type:Boolean,
     default:false
-  }
+  },
+  // 隐藏底部操作
+  hiddenFooterActions:{
+    type:Boolean,
+    default:false
+  },
 })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -248,7 +254,6 @@ const buttonBaseClick = (val, item) => {
 }
 
 
-defineExpose({ open,openData,updateData,hiddenFilterButton ,changeDialogWidth,searchFormClick}) // 提供 open 方法，用于打开弹窗
 
 // Table 组件 ref
 const searchTableRef = ref()
@@ -307,6 +312,11 @@ const rowClick = (row: any, column: any, event: Event) => {
     searchTableRef.value?.elTableRef?.toggleRowSelection(row, false)
   }
 }
+const cancleClick = ()=>{
+  searchDialogVisible.value = false
+}
+defineExpose({ open,openData,updateData,hiddenFilterButton ,changeDialogWidth,searchFormClick,submitForm,cancleClick,}) // 提供 open 方法，用于打开弹窗
+
 </script>
 <style scoped lang="scss">
 </style>
\ No newline at end of file
diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index 2c14ae415..8eeb365cb 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -62,7 +62,7 @@ const toDocument = () => {
       <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
       <div class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden"  style="display: flex; flex-direction: column;color:#ffffff">
         <span> {{ userName }} </span>
-        <span style="margin-top: 5px;text-align:center">{{ tenant.text }}</span>
+        <span style="margin-top: 5px;text-align:center">{{ tenant?tenant.text:'' }}</span>
       </div>
     </div>
     <template #dropdown>
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 768601fbc..c9a9d3052 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -300,6 +300,7 @@
         getCode()
         return
       }
+      
       loading.value = ElLoading.service({
         lock: true,
         text: '正在加载系统中...',
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/index.vue
new file mode 100644
index 000000000..42aa324d1
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/index.vue
@@ -0,0 +1,246 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="OnlinesettlementInfo.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="OnlinesettlementInfo.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="OnlinesettlementInfoRules"
+    :formAllSchemas="OnlinesettlementInfo.allSchemas"
+    :apiUpdate="OnlinesettlementInfoApi.updateOnlinesettlementInfo"
+    :apiCreate="OnlinesettlementInfoApi.createOnlinesettlementInfo"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="OnlinesettlementInfo.allSchemas" /> -->
+  <InfoDetail ref="infoDetailRef"/>
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/onlinesettlement-info/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { OnlinesettlementInfo,OnlinesettlementInfoRules } from './onlinesettlementInfo.data'
+import * as OnlinesettlementInfoApi from '@/api/wms/onlinesettlementInfo'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import InfoDetail from '../onlinesettlementInfoDetail/index.vue'
+defineOptions({ name: 'OnlinesettlementInfo' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(OnlinesettlementInfo.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: OnlinesettlementInfoApi.getOnlinesettlementInfoPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:onlinesettlement-info:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:onlinesettlement-info:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:onlinesettlement-info:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:onlinesettlement-info:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:onlinesettlement-info:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =OnlinesettlementInfo.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await OnlinesettlementInfoApi.createOnlinesettlementInfo(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await OnlinesettlementInfoApi.updateOnlinesettlementInfo(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const infoDetailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  // detailRef.value.openDetail(row, titleName, titleValue, 'basicOnlinesettlementInfo')
+  infoDetailRef.value.openDetail(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await OnlinesettlementInfoApi.deleteOnlinesettlementInfo(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OnlinesettlementInfoApi.exportOnlinesettlementInfo(tableObject.params)
+    download.excel(data, '上线结算记录信息新.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '上线结算记录信息新导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await OnlinesettlementInfoApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/onlinesettlementInfo.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/onlinesettlementInfo.data.ts
new file mode 100644
index 000000000..5926d8ff0
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/onlinesettlementInfo.data.ts
@@ -0,0 +1,387 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const OnlinesettlementInfoRules = reactive({
+  poNumber: [required],
+  poLine: [required],
+  itemCode: [required],
+  inventoryStatus: [required],
+  concurrencyStamp: [required],
+})
+
+export const OnlinesettlementInfo = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left',
+      width: 180
+    },
+  },
+  {
+    label: '收料记录单号',
+    field: 'receiptRecordNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '收货日期',
+    field: 'receiptDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商物料代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    form: {
+      component: 'Radio'
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    isTable:false,
+    isSearch: false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '来源库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '来源库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '来源仓库',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '目标库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '目标库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '目标库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '目标仓库',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '结算数量',
+    field: 'settlementQty',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '结算记录单号',
+    field: 'settlementRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '结算业务类型',
+    field: 'settlementBusinessType',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '结算日期',
+    field: 'settlementDatetime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  // {
+  //   label: '并发乐观锁',
+  //   field: 'concurrencyStamp',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   isTable:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     value: 0
+  //   },
+  // },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
+]))
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/index.vue
new file mode 100644
index 000000000..30964e2ad
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/index.vue
@@ -0,0 +1,67 @@
+<template>
+  <!-- 列表 -->
+  <Dialog
+    title="结算明细"
+    v-model="dialogVisible"
+    width="80%"
+    :close-on-click-modal="false"
+    :vLoading="formLoading"
+  >
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+    </Table></ContentWrap>
+  </Dialog>
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { OnlinesettlementInfoDetail,OnlinesettlementInfoDetailRules } from './onlinesettlementInfoDetail.data'
+import * as OnlinesettlementInfoDetailApi from '@/api/wms/onlinesettlementInfoDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'OnlinesettlementInfoDetail' })
+
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(OnlinesettlementInfoDetail.allSchemas.tableColumns)
+
+const dialogVisible = ref(false)
+const formLoading = ref(false)
+const openDetail = async ({number,id})=>{
+  dialogVisible.value = true
+  formLoading.value = true
+  await setSearchParams({
+    number,
+    masterId:id
+  })
+  formLoading.value = false
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: OnlinesettlementInfoDetailApi.getOnlinesettlementInfoDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+
+defineExpose({
+  openDetail
+}) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/onlinesettlementInfoDetail.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/onlinesettlementInfoDetail.data.ts
new file mode 100644
index 000000000..fafadd962
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/onlinesettlementInfoDetail.data.ts
@@ -0,0 +1,91 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const OnlinesettlementInfoDetailRules = reactive({
+  masterId: [required],
+  concurrencyStamp: [required],
+})
+
+export const OnlinesettlementInfoDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    isTable:false,
+  },
+  {
+    label: '结算数量',
+    field: 'settlementQty',
+    sort: 'custom',
+  },
+  {
+    label: '结算记录单号',
+    field: 'settlementRecordNumber',
+    sort: 'custom',
+  },
+  {
+    label: '结算业务类型',
+    field: 'settlementBusinessType',
+    sort: 'custom',
+  },
+  {
+    label: '结算日期',
+    field: 'settlementDatetime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
+]))
diff --git a/src/views/wms/issueManage/onlinesettlement/settlementConfiguration/index.vue b/src/views/wms/issueManage/onlinesettlement/settlementConfiguration/index.vue
new file mode 100644
index 000000000..391ed0961
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/settlementConfiguration/index.vue
@@ -0,0 +1,401 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SettlementConfiguration.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SettlementConfiguration.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm basicFormWidth="68"
+    ref="basicFormRef"
+    @success="submitForm"
+    :rules="SettlementConfigurationRules"
+    :formAllSchemas="SettlementConfiguration.allSchemas"
+    :apiUpdate="SettlementConfigurationApi.updateSettlementConfiguration"
+    :apiCreate="SettlementConfigurationApi.createSettlementConfiguration"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  >
+  <template #tableForm>
+    <!-- 来源库位 -->
+    <template style="display: flex; flex-direction: row;">
+      <div>
+        <span style="font-weight: bold; margin-left: 10px;">来源仓库</span>
+        <ContentWrap style="margin-right: 20px;margin-top: 5px;">
+          <TableForm
+            ref="tableFormFromRef"
+            class="w-[100%]"
+            :isShowButton="true"
+            :isShowReduceButtonSelection="true"
+            :tableFields="SettlementConfigurationDetail.allSchemas.tableFormColumns"
+            :tableData="tableDataFrom"
+            :tableFormRules="SettlementConfigurationDetailRules"
+            @handleAddTable="handleAddTable('from')"
+            @handleDeleteTable="(item, index)=>handleDeleteTable(item, index,'from')"
+            @tableSelectionDelete="(selection)=>tableSelectionDelete(selection,'from')"
+            @inpuFocus="inpuFocus"
+            @inputStringBlur="inputStringBlur"
+            :routeName="routeName"
+          >
+            <!-- <template v-slot="{ row }">
+              <slot :row="row"></slot>
+            </template> -->
+          </TableForm>
+      </ContentWrap>
+    </div>
+    <div>
+      <span style="font-weight: bold; margin-left: 10px;">目标仓库</span>
+      <ContentWrap style="margin-right: 20px;margin-top: 5px;">
+        <TableForm
+          ref="tableFormToRef"
+          class="w-[100%]"
+          :isShowButton="true"
+          :isShowReduceButtonSelection="true"
+          :tableFields="SettlementConfigurationDetail.allSchemas.tableFormColumns"
+          :tableData="tableDataTo"
+          :tableFormRules="SettlementConfigurationDetailRules"
+          @handleAddTable="handleAddTable('to')"
+          @handleDeleteTable="(item, index)=>handleDeleteTable(item, index,'to')"
+          @tableSelectionDelete="(selection)=>tableSelectionDelete(selection,'to')"
+          @inpuFocus="inpuFocus"
+          @inputStringBlur="inputStringBlur"
+          :routeName="routeName"
+        >
+          <!-- <template v-slot="{ row }">
+            <slot :row="row"></slot>
+          </template> -->
+        </TableForm>
+      </ContentWrap>
+    </div>
+    </template>
+  </template>
+
+  </BasicForm>
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SettlementConfiguration.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/settlement-configuration/import" :importTemplateData="importTemplateData" @success="importSuccess"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SettlementConfiguration,SettlementConfigurationRules,SettlementConfigurationDetail,SettlementConfigurationDetailRules } from './settlementConfiguration.data'
+import * as SettlementConfigurationApi from '@/api/wms/settlementConfiguration'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as WarehouseApi from '@/api/wms/warehouse'
+
+
+// 上线结算配置管理
+defineOptions({ name: 'SettlementConfiguration' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SettlementConfiguration.allSchemas.tableColumns)
+
+  // 主子数据 提交
+  const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  data.fromWarehouseCode = tableDataFrom.value.map(item=>(item['warehouseCode'])).join(',') // 拼接子表数据参数
+  data.toWarehouseCode = tableDataTo.value.map(item=>(item['warehouseCode'])).join(',') // 拼接子表数据参数
+  console.log('新增参数',data)
+  try {
+    if (formType === 'create') {
+      await SettlementConfigurationApi.createSettlementConfiguration(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SettlementConfigurationApi.updateSettlementConfiguration(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+const tableFormKeys = {}
+SettlementConfigurationDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+
+  console.log('searchTableSuccess',formField, searchField, val, formRef, type, row )
+  nextTick(() => {
+    if (formField == 'warehouseCode') {
+      if(addType.value== 'from'){
+        // 来源
+        let warehouseCodes = val.filter(item=>tableDataFrom.value.find(item1=>item1['warehouseCode']==item['code']))
+        if(warehouseCodes.length>0){
+          warehouseCodes = warehouseCodes.map(item=>(item.code))
+          message.warning(`仓库代码${warehouseCodes.join(',')}已经存在`)
+        }
+        val = val.filter(item=>!tableDataFrom.value.find(item1=>item1['warehouseCode']==item['code']))
+        if(val.length==0) return
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['warehouseCode'] = item['code']
+          newRow['warehouseName'] = item['name']
+          tableDataFrom.value.push(newRow)
+        })
+      }else{
+        // 目标
+        let warehouseCodes = val.filter(item=>tableDataTo.value.find(item1=>item1['warehouseCode']==item['code']))
+        if(warehouseCodes.length>0){
+          warehouseCodes = warehouseCodes.map(item=>(item.code))
+          message.warning(`仓库代码${warehouseCodes.join(',')}已经存在`)
+        }
+        val = val.filter(item=>!tableDataTo.value.find(item1=>item1['warehouseCode']==item['code']))
+        if(val.length==0) return
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['warehouseCode'] = item['code']
+          newRow['warehouseName'] = item['name']
+          tableDataTo.value.push(newRow)
+        })
+      }
+    }else{
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if(formField == 'supplierCode'){
+        setV['supplierName'] = val[0]['name']
+      }else if(formField == 'itemCode'){
+        setV['itemName'] = val[0]['itemName']
+        setV['itemDesc1'] = val[0]['itemDesc1']
+        setV['itemDesc2'] = val[0]['itemDesc2']
+      }
+      formRef.setValues(setV)
+    }
+    
+  })
+}
+// 来源库位
+const tableDataFrom = ref([])
+// 目标库位
+const tableDataTo = ref([])
+const addType = ref('')
+const handleAddTable = (type)=>{
+  addType.value = type
+  //供应商代码
+  basicFormRef.value.opensearchTable('warehouseCode', 'code', '仓库信息', Warehouse.allSchemas, WarehouseApi.getWarehousePage,[{
+    key: 'available',
+    value: 'TRUE',
+    isMainValue: false
+  }],true,'tableForm1')
+  //修改弹窗宽度
+  basicFormRef.value.changeDialogWidth('1085px')
+}
+ // 删除明细
+ const handleDeleteTable = (item, index, type) => {
+    if(type == 'from'){
+    // 来源
+    tableDataFrom.value.splice(index, 1)
+  }else {
+    // 目标
+    tableDataTo.value.splice(index, 1)
+  }
+}
+// 批量删除
+const tableSelectionDelete = (selection,type) => {
+  if(type == 'from'){
+    // 来源
+    tableDataFrom.value = tableDataFrom.value.filter(item => !selection.includes(item))
+  }else{
+    // 目标
+    tableDataTo.value = tableDataTo.value.filter(item => !selection.includes(item))
+  }
+}
+const inpuFocus = ()=>{
+  
+}
+const inputStringBlur = ()=>{
+  
+}
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SettlementConfigurationApi.getSettlementConfigurationPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:settlement-configuration:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:settlement-configuration:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:settlement-configuration:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    tableDataFrom.value = []
+    tableDataTo.value = []
+    openForm('create',null)
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:settlement-configuration:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:settlement-configuration:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    let res = await SettlementConfigurationApi.editSettlementConfiguration(row.id)
+    console.log('编辑',res)
+    tableDataFrom.value = res.fromWarehouseCodeList
+    tableDataTo.value = res.toWarehouseCodeList
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSettlementConfiguration')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SettlementConfigurationApi.deleteSettlementConfiguration(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SettlementConfigurationApi.exportSettlementConfiguration(tableObject.params)
+    download.excel(data, '上线结算配置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '上线结算配置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SettlementConfigurationApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/issueManage/onlinesettlement/settlementConfiguration/settlementConfiguration.data.ts b/src/views/wms/issueManage/onlinesettlement/settlementConfiguration/settlementConfiguration.data.ts
new file mode 100644
index 000000000..ab4b0f97e
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/settlementConfiguration/settlementConfiguration.data.ts
@@ -0,0 +1,240 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem} from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as WarehouseApi from '@/api/wms/warehouse'
+
+// 表单校验
+export const SettlementConfigurationRules = reactive({
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'blur' }
+  ],
+})
+
+export const SettlementConfiguration = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'ID',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    },
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '供应商物料信息', // 查询弹窗标题
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true,
+          isCSV:true,//是否用逗号分隔参数
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料描述',
+    field: 'itemDesc1',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '来源仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isForm: false
+  },
+  {
+    label: '目标仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    isForm: false
+  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  // {
+  //   label: '并发乐观锁',
+  //   field: 'concurrencyStamp',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   isTable: false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     value: 0
+  //   },
+  // },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+export const SettlementConfigurationDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    tableForm:{
+      multiple:true,//多选
+      enterSearch: false,
+      isInpuFocusShow: false, // 开启查询弹窗
+      disabled: true,
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }
+      ],
+      verificationParams: [
+        {
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true
+        }
+      ] // 失去焦点校验参数
+    },
+  },
+  {
+    label: '仓库名称',
+    field: 'warehouseName',
+    sort: 'custom',
+    tableForm:{
+      disabled: true
+    }
+  },
+]))
+
+
+//表单校验
+export const SettlementConfigurationDetailRules = reactive({
+  fromWarehouseCode: [
+    { required: true, message: '请选择来源仓库', trigger: 'change' }
+  ]
+})
diff --git a/src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue b/src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue
new file mode 100644
index 000000000..9fefd8abc
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue
@@ -0,0 +1,279 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SettlementReport.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SettlementReport.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 结算库位列表 -->
+  <SearchTable
+    ref="searchTableRef"
+    :showSearchTableQueryFields="['itemCode']"
+    :hiddenFilterBtnFields="[]"
+    :isCheckStrictly="false"
+    @searchTableSuccess="searchTableSuccess"
+    :hiddenFooterActions="true"
+  >
+  <template #footerActions>
+    <div class="flex items-center" style="justify-content: flex-end;">
+      <el-button type="primary" @click="settlementClick">结算库位</el-button>
+      <el-button @click="cancleClick">{{ t(`ts.${'取 消'}`) }}</el-button>
+    </div>
+  </template>
+  <template #searchQueryhahaha>
+    <Form
+        ref="basicFormRef"
+        :rules="SettlementReportSelectionFormRules"
+        :schema="SettlementReportSelectionForm.allSchemas.formSchema"
+        :is-col="true"
+        @opensearchTable="opensearchTable"
+        @onBlur="onBlur"
+      />
+    </template>
+  </SearchTable>
+
+  <!-- 库位 -->
+  <SearchTable
+    ref="searchTableRef1"
+    @searchTableSuccess="searchTableSuccess1"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SettlementReport,SettlementReportRules,SettlementReportSelection,SettlementReportSelectionlRules,SettlementReportSelectionForm,SettlementReportSelectionFormRules } from './settlementReport.data'
+import * as SettlementtReportApi from '@/api/wms/settlementReport'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as WarehouseApi from '@/api/wms/warehouse'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/inputBlur'
+
+
+// 上线结算配置管理
+defineOptions({ name: 'SettlementReport' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SettlementReport.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SettlementtReportApi.getSettlementReportPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [{
+    label: '结算',
+    name: 'settlement',
+    hide: row.settledStatus==2,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: ''
+  }]
+}
+
+const searchTableRef = ref()
+// 列表-操作按钮事件
+const settlementRow = ref(null)
+const buttonTableClick = async (val, row) => {
+  settlementRow.value = row
+  if(val == 'settlement'){
+    // 结算
+    searchTableRef.value.open(
+      "批量结算",
+      SettlementReportSelection.allSchemas,
+      SettlementtReportApi.getSettlementReportBalance,
+      "hahaha",
+      "hahaha",
+      true,
+      'tableForm',
+      null,
+      {
+        supplierCode:row.supplierCode,
+        itemCode:row.itemCode,
+        batch:row.batch
+      },
+      undefined,
+      false,
+      null
+    )
+  }
+}
+// 批量结算
+const settlementClick = ()=>{
+  if(!basicFormRef.value.formModel['toLocationCode']){
+    message.warning('请选择结算库位')
+    return
+  }else{
+    searchTableRef.value.submitForm()
+  }
+}
+
+const cancleClick = ()=>{
+  searchTableRef.value.cancleClick()
+}
+// 批量结算
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  console.log('formModel',basicFormRef.value.formModel['toLocationCode'])
+  console.log('searchTableSuccess',formField, searchField, val, formRef, type, row )
+  nextTick(async () => {
+    let ids = []
+    ids = val.map(item=>(item['id']))
+    ids.join(',')
+    let res = await SettlementtReportApi.submitSettlementReport({
+      ids,
+      toLocationCode:basicFormRef.value.formModel['toLocationCode']||''
+    })
+    if(res==1){
+      message.success('提交成功')
+      getList()
+    }
+  })
+}
+
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+// 结算库位
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row,
+  isConcatDetailSchemas = false,
+  searchDetailSchemas: any
+) => {
+  
+    searchTableRef1.value.open(
+      "结算库位",
+      Location.allSchemas,
+      LocationApi.getLocationPageOnlineSettlement,
+      "toLocationCode",
+      "code",
+      false,
+      'form',
+      null,
+      {
+        supplierCode:settlementRow.value?.supplierCode,
+        itemCode:settlementRow.value?.itemCode,
+      },
+      undefined,
+      false,
+      null
+    )
+}
+
+const searchTableRef1 = ref()
+const searchTableSuccess1 = (formField, searchField, val, formRef, type, row) => {
+  console.log('searchTableSuccess',formField, searchField, val, formRef, type, row )
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    basicFormRef.value.setValues(setV)
+  })
+}
+const onBlur = async (field, e) => {
+  let formSchemaObj = SettlementReportSelectionForm.allSchemas.formSchema.find((item) => item.field == field)?.componentProps
+  if (formSchemaObj?.enterSearch) {
+    await FormBlur(
+      field,
+      e,
+      routeName.value,
+      basicFormRef.value,
+      null,
+      formSchemaObj,
+      (list) => {
+        searchTableSuccess1(field, formSchemaObj.searchField, list, basicFormRef.value, 'form')
+      }
+    )
+  }
+}
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  // importTemplateData.templateUrl = await SettlementConfigurationApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/issueManage/onlinesettlement/settlementReport/settlementReport.data.ts b/src/views/wms/issueManage/onlinesettlement/settlementReport/settlementReport.data.ts
new file mode 100644
index 000000000..9b7a95083
--- /dev/null
+++ b/src/views/wms/issueManage/onlinesettlement/settlementReport/settlementReport.data.ts
@@ -0,0 +1,206 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem} from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as WarehouseApi from '@/api/wms/warehouse'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+// 表单校验
+export const SettlementReportRules = reactive({
+})
+
+export const SettlementReport = useCrudSchemas(reactive<CrudSchema[]>([
+  
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+  },
+  {
+    label: '累计收货量',
+    field: 'totalReceiptQty',
+    sort: 'custom',
+  },
+  {
+    label: '已结算数量',
+    field: 'totalSettledQty',
+    sort: 'custom',
+  },
+  {
+    label: '未结算数量',
+    field: 'totalOutstandingSettleQty',
+    sort: 'custom',
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+export const SettlementReportSelection = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: ' ',
+    field: 'hahaha',
+    table: {
+      width: 180
+    },
+    isTable:false,
+    isDetail:false,
+    form: {
+      componentProps: {
+        type: 'slot',
+      }
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+  },
+  {
+    label: '库存数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+  }
+]))
+//表单校验
+export const SettlementReportSelectionRules = reactive({
+  // fromWarehouseCode: [
+  //   { required: true, message: '请选择来源仓库', trigger: 'change' }
+  // ],
+})
+
+
+export const SettlementReportSelectionForm = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '结算库位',
+    field: 'toLocationCode',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择结算库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPageOnlineSettlement, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+        },{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true
+        }], // 失去焦点校验参数
+      }
+    }
+  }
+]))
+
+export const SettlementReportSelectionFormRules = reactive({
+  toLocationCode: [
+    { required: true, message: '请选择结算库位', trigger: 'change' }
+  ],
+})
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/index.vue
new file mode 100644
index 000000000..bc6b4f320
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/index.vue
@@ -0,0 +1,482 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...InventorymoveRecordMainNew.allSchemas.searchSchema,...InventorymoveRecordDetailNew.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventorymoveRecordMainNew.allSchemas"
+      :detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <!-- isCheckStrictly 取消主子关联 -->
+  <BasicForm
+    ref="formRef"
+    :isOpenSearchTable="true"
+    :isCheckStrictly="true" 
+    fieldTableColumn="itemCode"
+    @success="getList"
+    :rules="InventorymoveRequestMainRules"
+    :formAllSchemas="InventorymoveRequestMain.allSchemas"
+    :tableAllSchemas="InventorymoveRequestDetail.allSchemas"
+    :tableFormRules="InventorymoveRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="InventorymoveRequestMainApi.updateInventorymoveRequestMain"
+    :apiCreate="InventorymoveRequestMainApi.createInventorymoveRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @clearSearchInput="clearSearchInput"
+    />
+
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventorymoveRecordMainNew.allSchemas"
+    :detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
+    :detailAllSchemasRules="InventorymoveRecordDetailNewRules"
+    :apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage"
+  />
+  <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
+<!-- 导入 -->
+<ImportForm ref="importFormRef" url="/wms/inventorymove-record-main/import" :importTemplateData="importTemplateData"
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { InventorymoveRecordMainNew,InventorymoveRecordDetailNew,InventorymoveRecordDetailNewRules } from './inventorymoveRecordMainNew.data'
+import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRecordRequestMain.data'
+import {
+  SupplierdeliverRequestPackage
+} from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+
+import { getAccessToken } from '@/utils/auth'
+
+import * as PackageApi from '@/api/wms/package'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
+import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain'
+import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+// 库存转移记录(新)InventorymoveRecordMainNew
+defineOptions({ name: 'InventorymoveRecordMainNew' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const importFileName = ref()
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...InventorymoveRecordMainNew.allSchemas.tableColumns,...InventorymoveRecordDetailNew.allSchemas.tableMainColumns])
+console.log(99 ,  routeName.value)
+const fromInventoryStatus = ref()
+const toInventoryStatus = ref()
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage // 分页接口
+})
+tableObject.params.businessType = 'onlineSettleMove'
+
+// 判断 路由名称 进行条件过滤
+console.log(146 , fromInventoryStatus.value)
+fromInventoryStatus.value = null
+importFileName.value = '上线结算库存移动记录'
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  //defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  // defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 列表-操作按钮
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  // const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  // if(findIndex>-1&&findIndex<$index){
+  //   return []
+  // }
+  return [
+    defaultButtons.mainListPointBtn(null), // 标签打印
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'point') { // 标签打印
+    labelPrint(row)
+  }
+}
+const BASE_URL = getJmreportBaseUrl()
+// 标签打印
+const searchTableRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等
+//获取类型
+const getLabelType = async (row,useToPackingNumber)=>{
+  labelType.value = ''
+  let resType = await PackageApi.getPackagePage(useToPackingNumber?{
+    number: row.toPackingNumber
+  }:{
+    requestNumber:  row.number
+  })
+  console.log('resType',resType)
+  if(resType.list.length > 0){
+    if (resType.list[0].productionLineCode != null) {
+      labelType.value = 'zz'
+    } else {
+      labelType.value = 'cg'
+    }
+    console.log('labelType',labelType.value)
+    await getLabelDetailPage(row,false)
+
+  }else{
+    await getLabelType(row,true)
+  }
+}
+const getLabelDetailPage = async (row,useToPackingNumber)=>{
+  let defaultParams = {'moduleName':'move','recordNumber':row.number}
+  if(useToPackingNumber){
+    defaultParams = {'moduleName':'move','recordNumber':row.toPackingNumber}
+  }
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  await getListPrint()
+  if(!useToPackingNumber&&(!tableObjectPrint || !tableObjectPrint.tableList || tableObjectPrint.tableList.length==0)){
+    getLabelDetailPage(row,true)
+    return
+  }
+  console.log('tableObjectPrint',tableObjectPrint)
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  //获取类型
+  await getLabelType(row,false)
+  
+}
+// 批量打印--预生产收货
+const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"recordInventorymoveMain")
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+InventorymoveRecordDetailNew.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
+//为true表示子表数据中存在数量为0的数据
+
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  data.subList = tableData.value // 拼接子表数据参数
+  let flag = false
+  data.subList.forEach(item => {
+    item.toBatch = item.fromBatch
+    item.fromLocationCode = data.fromLocationCode
+    item.toLocationCode = data.toLocationCode
+    item.toInventoryStatus = data.toInventoryStatus
+    if(item.checkQty>0&&Number(item.qty)==0){
+      message.error(`${item['itemCode']}数量不能为0!`)
+      flag = true
+      return;
+    }
+    if(item.checkQty>0&&item.qty<0){
+      message.error(`${item['itemCode']}数量不能小于0!`)
+      flag = true
+      return;
+    }
+  })
+  let findLocation = tableData.value.find(item=>item.fromLocationCode==item.toLocationCode&&item.fromInventoryStatus==item.toInventoryStatus)
+  if(findLocation){
+    message.warning('从库位和到库位不能相同')
+    return
+  }
+  if(flag){
+    formRef.value.formLoading = false
+    return
+  }
+  formRef.value.formLoading = true
+  console.log('data',data)
+  try {
+    if (formType === 'create') {
+      await InventorymoveRecordMainApi.createInventorymoveRecordMain(data)
+      message.success(t('common.createSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+const clearSearchInput = (field)=>{
+  console.log('field',field)
+  if('fromLocationCode' == field){
+    //从库位代码
+    tableData.value = []
+  }
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if(formField == 'itemCode'){
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['origin_fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        if(val.length==0) return
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['fromPackingNumber'] = item['packingNumber']
+          newRow['toPackingNumber'] = item['packingNumber']
+          newRow['fromContainerNumber'] = item['containerNumber']
+          newRow['itemCode'] = item['itemCode']
+          newRow['fromBatch'] = item['batch']
+          newRow['fromInventoryStatus'] = item['inventoryStatus']
+          newRow['origin_fromLocationCode'] = item['locationCode']
+          newRow['uom'] = item['uom']
+          newRow['checkQty'] = item['qty'] //用于保存的时候作校验 HL-5524
+          newRow['qty'] = item['qty']
+          if(item['packingNumber']&&item['packingNumber'].length>0){
+            newRow['packUnit'] = item['packUnit']
+            newRow['packQty'] = item['packQty']
+          }else{
+            newRow['packUnit'] = ''
+            newRow['packQty'] = ''
+          }
+          newRow['disabled_qty'] = item['packingNumber']&&item['packingNumber'].length>0
+          tableData.value.push(newRow)
+        })
+      }else if(formField == 'packUnit'){
+        //包装规格
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if(formField=='fromLocationCode'){
+        //从库位代码
+        setV['fromWarehouseCode'] = val[0]['warehouseCode']
+        tableData.value = []
+
+      }else if(formField=='toLocationCode'){
+        //到库位代码
+        setV['toWarehouseCode'] = val[0]['warehouseCode']
+      }
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: [...searchData.filters,{
+      action: "==",
+      column: "business_type",
+      value: "onlineSettleMove"
+    }]
+  }
+  getList() // 刷新当前列表
+}
+
+const searchList = (model)=>{
+  model.businessType='Move'
+  setSearchParams(model)
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  // 库存转移记录(新)InventorymoveRecordMainNew
+  importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplate()
+})
+</script>
+./inventorymoveRecordRequestMain.data
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/inventorymoveRecordMainNew.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/inventorymoveRecordMainNew.data.ts
new file mode 100644
index 000000000..f928301b2
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/inventorymoveRecordMainNew.data.ts
@@ -0,0 +1,479 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 库存转移记录主表
+ */
+export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:22
+
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:23
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:24
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:25
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:36
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    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',
+      }
+    },
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    sortTableDefault:34
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:35
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '是否可用',
+  //   field: 'available',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const InventorymoveRecordMainNewRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存转移记录子表
+ */
+export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:10,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:27
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:28
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:29
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:18
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:19
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:11
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:17
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:30
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:14
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:15
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:16
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:31
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:32
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:20
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:21
+  },
+]))
+
+//表单校验
+export const InventorymoveRecordDetailNewRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  fromInventoryStatus: [
+    { required: true, message: '请选择从库存状态', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  toInventoryStatus: [
+    { required: true, message: '请选择到库存状态', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/inventorymoveRecordRequestMain.data.ts
new file mode 100644
index 000000000..f447783cf
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/inventorymoveRecordRequestMain.data.ts
@@ -0,0 +1,988 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as LocationApi  from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@//views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'MoveRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 库存转移申请主表
+ */
+export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+      searchCondition: [
+      {
+        key: 'businessType',
+        value: 'Move',
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }],
+      isRepeat:true,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择从库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+        searchCondition: [
+          {
+            key: 'businessType',
+            value: 'Move',
+            isMainValue: false
+          },{
+            key: 'isIn',
+            value: 'out',
+            isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+      searchCondition: [
+      {
+        key: 'businessType',
+        value: 'Move',
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      },
+      {
+        key:'available', // 查询列表中字段
+        value:'TRUE', // 指查询具体值
+        isMainValue: false // 表示查询条件不是主表的字段的值
+      }],
+      isRepeat:true,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+        searchCondition: [
+          {
+            key: 'businessType',
+            value: 'Move',
+            isMainValue: false
+          },{
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
+          },
+          {
+            key:'available', // 查询列表中字段
+            value:'TRUE', // 指查询具体值
+            isMainValue: false // 表示查询条件不是主表的字段的值
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false,
+      type: 'Select'
+    },
+    form: {
+      value:'OK',
+      componentProps: {
+        disabled: false,
+      }
+    }
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    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',
+      }
+    },
+  },
+]))
+
+//表单校验
+export const InventorymoveRequestMainRules = reactive({
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'blur' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ]
+})
+export const BalanceCopy = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '器具代码',
+    //   field: 'containerNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false
+    // },
+    {
+      label: '库存数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '物料描述1',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenSearchHigh: true,// 高级筛选中隐藏
+      isSearch: true
+    },
+    {
+      label: '物料描述2',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenSearchHigh: true,// 高级筛选中隐藏
+      isSearch: true
+    },
+    {
+      label: '物料类型',
+      field: 'itemType',
+      sort: 'custom',
+      dictType: DICT_TYPE.ITEM_TYPE,
+      dictClass: 'string',
+      isSearch: true,
+      table: {
+        width: 100
+      }
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '供应商批次',
+      field: 'altBatch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: false
+    },
+    {
+      label: '包装号',
+      field: 'packingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '器具代码',
+    //   field: 'containerNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false
+    // },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '库位代码',
+      field: 'locationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '库区类型',
+      field: 'areaType',
+      sort: 'custom',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      table: {
+        width: 150
+      }
+    },
+
+    {
+      label: '仓库代码',
+      field: 'warehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '库位组代码',
+      field: 'locationGroupCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '库区代码',
+      field: 'areaCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: 'ERP库位代码',
+    //   field: 'erpLocationCode',
+    //   dictType: DICT_TYPE.ERP_LOCATION,
+    //   dictClass: 'string',
+    //   isTable: false,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    // {
+    //   label: '替代批次',
+    //   field: 'altBatch',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false,
+    // },
+    {
+      label: '到货日期',
+      field: 'arriveDate',
+      isTable: true,
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '生产日期',
+      field: 'produceDate',
+      isTable: true,
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '失效日期',
+      field: 'expireDate',
+      isTable: true,
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '货主代码',
+      field: 'ownerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '锁定数量',
+      field: 'lockedQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    // {
+    //   label: '可用数量',
+    //   field: 'usableQty',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '单价',
+    //   field: 'singlePrice',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '金额',
+    //   field: 'amount',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '入库时间',
+    //   field: 'putInTime',
+    //   isTable: true,
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       type: 'datetime',
+    //     }
+    //   }
+    // },
+    {
+      label: '是否冻结',
+      field: 'frozen',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    // {
+    //   label: '冻结原因',
+    //   field: 'frozenReason',
+    //   dictType: DICT_TYPE.FROZEN_REASON,
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    // {
+    //   label: '重量',
+    //   field: 'weight',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '面积',
+    //   field: 'area',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '体积',
+    //   field: 'volume',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    {
+      label: '最后事务号',
+      field: 'lastTransNumber',
+      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: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false,
+      isSearch: true,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'datetimerange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      }
+    },
+    {
+      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,
+      isTable: true
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: true
+    },
+    // TODO: 临时添加 方便操作
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 200,
+        fixed: 'right'
+      }
+    }
+  ])
+)
+/**
+ * @returns {Array} 库存转移申请子表
+ */
+export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      multiple:true,
+      disabled: true,
+      isInpuFocusShow: false, // 开启查询弹窗
+      searchListPlaceholder: '请选择从包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: BalanceCopy.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
+      searchCondition: [{
+          key: 'businessType',
+          value: 'Move',
+          isMainValue: false
+      },{
+        key:'locationCode', // 查询列表中字段
+        value:'fromLocationCode', // 指主表某字段 
+        message: '请选择从库位代码！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true, // 表示查询条件是主表的字段的值
+        action: '==', // 查询拼接条件
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择从包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: BalanceCopy.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
+        searchCondition: [{
+            key: 'businessType',
+            value: 'Move',
+            isMainValue: false
+        }]
+      }
+    }
+    
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm:false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm:false,
+    isForm: false,
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: true,
+    isForm: false,
+    tableForm:{
+      multiple:false,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'packUnit',
+      searchTitle: '物料包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItempackagingApi.getItempackagingPageTree,
+      searchCondition: [{
+        key:'itemCode', // 查询列表中字段
+        value:'itemCode', // 指主表某字段 
+        message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true, // 表示查询条件是主表的字段的值
+        action: '==', // 查询拼接条件
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'packUnit',
+        searchTitle: '物料包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItempackagingApi.getItempackagingPageTree,
+        searchCondition: [{
+          key:'itemCode', // 查询列表中字段
+          value:'itemCode', // 指主表某字段 
+          message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true, // 表示查询条件是主表的字段的值
+          action: '==', // 查询拼接条件
+        }]
+      }
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '供应商批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        // min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: false,
+      type: 'InputNumber',
+      // min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  }
+]))
+
+//表单校验
+export const InventorymoveRequestDetailRules = reactive({
+  itemCode: [
+    { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+  ],
+  fromInventoryStatus: [
+    { required: true, message: '请选择从库存状态', trigger: 'change' }
+  ],
+  toInventoryStatus: [
+    { required: true, message: '请选择到库存状态', trigger: 'change' }
+  ]
+})