diff --git a/src/api/wms/finishedShipmentDetail/index.ts b/src/api/wms/finishedShipmentDetail/index.ts
new file mode 100644
index 000000000..fffcf28ee
--- /dev/null
+++ b/src/api/wms/finishedShipmentDetail/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface FinishedShipmentDetailVO {
+  id: number
+  masterId: number
+  materialCode: string
+  materialName: string
+  backNumber: string
+  materialDescription: string
+  shipmentQuantity: number
+  unitPrice: number
+  lockedQuantity: number
+  available: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询已发未结发货记录子列表
+export const getFinishedShipmentDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/finished-shipment-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/finished-shipment-record-detail/page`, params })
+  }
+}
+
+// 查询已发未结发货记录子详情
+export const getFinishedShipmentDetail = async (id: number) => {
+  return await request.get({ url: `/wms/finished-shipment-record-detail/get?id=` + id })
+}
+
+// 新增已发未结发货记录子
+export const createFinishedShipmentDetail = async (data: FinishedShipmentDetailVO) => {
+  return await request.post({ url: `/wms/finished-shipment-record-detail/create`, data })
+}
+
+// 修改已发未结发货记录子
+export const updateFinishedShipmentDetail = async (data: FinishedShipmentDetailVO) => {
+  return await request.put({ url: `/wms/finished-shipment-record-detail/update`, data })
+}
+
+// 删除已发未结发货记录子
+export const deleteFinishedShipmentDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/finished-shipment-record-detail/delete?id=` + id })
+}
+
+// 导出已发未结发货记录子 Excel
+export const exportFinishedShipmentDetail = async (params) => {
+  return await request.download({ url: `/wms/finished-shipment-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/finished-shipment-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/finishedShipmentMain/index.ts b/src/api/wms/finishedShipmentMain/index.ts
new file mode 100644
index 000000000..b3b1666e9
--- /dev/null
+++ b/src/api/wms/finishedShipmentMain/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface FinishedShipmentMainVO {
+  id: number
+  orderNumber: string
+  shipmentRecordNumber: string
+  shipmentType: string
+  customerOrderNumber: string
+  available: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询已发未结发货记录主列表
+export const getFinishedShipmentMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/finished-shipment-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/finished-shipment-record-main/page`, params })
+  }
+}
+
+// 查询已发未结发货记录主详情
+export const getFinishedShipmentMain = async (id: number) => {
+  return await request.get({ url: `/wms/finished-shipment-record-main/get?id=` + id })
+}
+
+// 新增已发未结发货记录主
+export const createFinishedShipmentMain = async (data: FinishedShipmentMainVO) => {
+  return await request.post({ url: `/wms/finished-shipment-record-main/create`, data })
+}
+
+// 修改已发未结发货记录主
+export const updateFinishedShipmentMain = async (data: FinishedShipmentMainVO) => {
+  return await request.put({ url: `/wms/finished-shipment-record-main/update`, data })
+}
+
+// 删除已发未结发货记录主
+export const deleteFinishedShipmentMain = async (id: number) => {
+  return await request.delete({ url: `/wms/finished-shipment-record-main/delete?id=` + id })
+}
+
+// 导出已发未结发货记录主 Excel
+export const exportFinishedShipmentMain = async (params) => {
+  return await request.download({ url: `/wms/finished-shipment-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/finished-shipment-record-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
index ab7989872..f97d78199 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
@@ -2,7 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
-export const UnfinishedShipmentMainRules = reactive({
+export const FinishedShipmentMainRules = reactive({
   orderNumber: [required],
   shipmentRecordNumber: [required],
   shipmentType: [required],
@@ -11,7 +11,7 @@ export const UnfinishedShipmentMainRules = reactive({
   concurrencyStamp: [required]
 })
 
-export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
+export const FinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
   
   {
     label: '单据号',
@@ -22,6 +22,15 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '已发未结记录单号',
+    field: 'unfinishedNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isSearch: true
+  },
   {
     label: '发货记录单号',
     field: 'shipmentRecordNumber',
@@ -32,7 +41,7 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '发货方式',
+    label: '发货类型',
     field: 'shipmentType',
     sort: 'custom',
     isSearch: true,
@@ -69,7 +78,7 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 
 // 表单校验
-export const UnfinishedShipmentDetailRules = reactive({
+export const FinishedShipmentDetailRules = reactive({
   materialCode: [required],
   materialName: [required],
   backNumber: [required],
@@ -81,7 +90,7 @@ export const UnfinishedShipmentDetailRules = reactive({
   concurrencyStamp: [required]
 })
 
-export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
+export const FinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
   
   {
     label: '物料代码',
@@ -126,9 +135,36 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  // {
+  //   label: '发货数量',
+  //   field: 'shipmentQuantity',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  //   isSearch: true,
+  //   form: {
+  //     component: 'InputNumber',
+  //     value: 0
+  //   }
+  // },
+  
+  // {
+  //   label: '锁定数量',
+  //   field: 'lockedQuantity',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  //   isSearch: true,
+  //   form: {
+  //     component: 'InputNumber',
+  //     value: 0
+  //   }
+  // },
   {
-    label: '发货数量',
-    field: 'shipmentQuantity',
+    label: '已结数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150,
@@ -148,36 +184,6 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
-    label: '锁定数量',
-    field: 'lockedQuantity',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
-  // {
-  //   label: '是否可用',
-  //   field: 'available',
-  //   sort: 'custom',
-  //     dictType: DICT_TYPE.TRUE_FALSE,
-  //     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-  //   isSearch: true,
-  //               form: {
-  //                 component: 'Switch',
-  //                 value: 'TRUE',
-  //                 componentProps: {
-  //                   inactiveValue: 'FALSE',
-  //                   activeValue: 'TRUE'
-  //                 }
-  //               }
-  // },
-
   {
     label: '创建时间',
     field: 'createTime',
@@ -195,7 +201,8 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false
+    isForm: false,
+    hiddenInMain:true
   },
   {
     label: '创建人',
@@ -205,6 +212,8 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: true,
+    hiddenInMain:true
+
   },
   // {
   //   label: '操作',
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue
index f45b7826a..23f0d3730 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue
+++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...UnfinishedShipmentMain.allSchemas.searchSchema,...UnfinishedShipmentDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...FinishedShipmentMain.allSchemas.searchSchema,...FinishedShipmentDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,8 +11,8 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="UnfinishedShipmentMain.allSchemas"
-      :detailAllSchemas="UnfinishedShipmentDetail.allSchemas"
+      :allSchemas="FinishedShipmentMain.allSchemas"
+      :detailAllSchemas="FinishedShipmentDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -43,10 +43,10 @@
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
-    :rules="UnfinishedShipmentMainRules"
-    :formAllSchemas="UnfinishedShipmentMain.allSchemas"
-    :apiUpdate="UnfinishedShipmentMainApi.updateUnfinishedShipmentMain"
-    :apiCreate="UnfinishedShipmentMainApi.createUnfinishedShipmentMain"
+    :rules="FinishedShipmentMainRules"
+    :formAllSchemas="FinishedShipmentMain.allSchemas"
+    :apiUpdate="FinishedShipmentMainApi.updateFinishedShipmentMain"
+    :apiCreate="FinishedShipmentMainApi.createFinishedShipmentMain"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
   />
@@ -55,10 +55,10 @@
   <Detail 
     ref="detailRef" 
     :isBasic="false" 
-    :allSchemas="UnfinishedShipmentMain.allSchemas" 
-    :detailAllSchemas="UnfinishedShipmentDetail.allSchemas"
-    :detailAllSchemasRules="UnfinishedShipmentDetailRules"
-    :apiPage="UnfinishedShipmentDetailApi.getUnfinishedShipmentDetailPage"
+    :allSchemas="FinishedShipmentMain.allSchemas" 
+    :detailAllSchemas="FinishedShipmentDetail.allSchemas"
+    :detailAllSchemasRules="FinishedShipmentDetailRules"
+    :apiPage="FinishedShipmentDetailApi.getFinishedShipmentDetailPage"
   />
 
   <!-- 导入 -->
@@ -67,15 +67,15 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { UnfinishedShipmentMain,UnfinishedShipmentMainRules,UnfinishedShipmentDetail,UnfinishedShipmentDetailRules } from './finishedShipmentMain.data'
-import * as UnfinishedShipmentMainApi from '@/api/wms/unfinishedShipmentMain'
+import { FinishedShipmentMain,FinishedShipmentMainRules,FinishedShipmentDetail,FinishedShipmentDetailRules } from './finishedShipmentMain.data'
+import * as FinishedShipmentMainApi from '@/api/wms/finishedShipmentMain'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as UnfinishedShipmentDetailApi from '@/api/wms/unfinishedShipmentDetail'
+import * as FinishedShipmentDetailApi from '@/api/wms/finishedShipmentDetail'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
-defineOptions({ name: 'UnfinishedShipmentMain' })
+defineOptions({ name: 'FinishedShipmentMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -83,7 +83,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...UnfinishedShipmentMain.allSchemas.tableColumns,...UnfinishedShipmentDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([...FinishedShipmentMain.allSchemas.tableColumns,...FinishedShipmentDetail.allSchemas.tableMainColumns])
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -100,7 +100,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: UnfinishedShipmentDetailApi.getUnfinishedShipmentDetailPage // 分页接口
+  getListApi: FinishedShipmentDetailApi.getFinishedShipmentDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -163,7 +163,7 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-  var isHave =UnfinishedShipmentMain.allSchemas.formSchema.some(function (item) {
+  var isHave =FinishedShipmentMain.allSchemas.formSchema.some(function (item) {
     return item.field === 'activeTime' || item.field === 'expireTime';
   });
   if(isHave){
@@ -175,10 +175,10 @@ const formsSuccess = async (formType,data) => {
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
-    await UnfinishedShipmentMainApi.createUnfinishedShipmentMain(data)
+    await FinishedShipmentMainApi.createFinishedShipmentMain(data)
     message.success(t('common.createSuccess'))
   } else {
-    await UnfinishedShipmentMainApi.updateUnfinishedShipmentMain(data)
+    await FinishedShipmentMainApi.updateFinishedShipmentMain(data)
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
@@ -188,7 +188,7 @@ const formsSuccess = async (formType,data) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicUnfinishedShipmentMain')
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicFinishedShipmentMain')
 }
 
 /** 删除按钮操作 */
@@ -197,7 +197,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await UnfinishedShipmentMainApi.deleteUnfinishedShipmentMain(id)
+    await FinishedShipmentMainApi.deleteFinishedShipmentMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -212,7 +212,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await UnfinishedShipmentMainApi.exportUnfinishedShipmentMain(tableObject.params)
+    const data = await FinishedShipmentMainApi.exportFinishedShipmentMain(tableObject.params)
     download.excel(data, '已发未结发货记录主.xlsx')
   } catch {
   } finally {
@@ -247,7 +247,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await UnfinishedShipmentMainApi.importTemplate()
+  importTemplateData.templateUrl = await FinishedShipmentMainApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
index 287b78b53..d93c09d87 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
@@ -101,6 +101,7 @@ const updataTableColumns = (val) => {
 
 const { tableObject, tableMethods } = useTable({
   getListApi: UnfinishedShipmentDetailApi.getUnfinishedShipmentDetailPage // 分页接口
+  
 })
 
 // 获得表格的各种操作
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
index ab7989872..34e7ea6cd 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
@@ -32,7 +32,7 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '发货方式',
+    label: '发货类型',
     field: 'shipmentType',
     sort: 'custom',
     isSearch: true,
@@ -139,15 +139,7 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     }
   },
-  {
-    label: '销售单价',
-    field: 'unitPrice',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isSearch: true
-  },
+  
   {
     label: '锁定数量',
     field: 'lockedQuantity',
@@ -161,23 +153,15 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     }
   },
-  // {
-  //   label: '是否可用',
-  //   field: 'available',
-  //   sort: 'custom',
-  //     dictType: DICT_TYPE.TRUE_FALSE,
-  //     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-  //   isSearch: true,
-  //               form: {
-  //                 component: 'Switch',
-  //                 value: 'TRUE',
-  //                 componentProps: {
-  //                   inactiveValue: 'FALSE',
-  //                   activeValue: 'TRUE'
-  //                 }
-  //               }
-  // },
-
+  {
+    label: '销售单价',
+    field: 'unitPrice',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isSearch: true
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -195,7 +179,8 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false
+    isForm: false,
+    hiddenInMain:true
   },
   {
     label: '创建人',
@@ -205,6 +190,8 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: true,
+    hiddenInMain:true
+
   },
   // {
   //   label: '操作',
diff --git a/src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/index.vue b/src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/index.vue
deleted file mode 100644
index 9da66a534..000000000
--- a/src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/index.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="UnfinishedShipmentDetail.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
-
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="UnfinishedShipmentDetail.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
-    ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="UnfinishedShipmentDetailRules"
-    :formAllSchemas="UnfinishedShipmentDetail.allSchemas"
-    :apiUpdate="UnfinishedShipmentDetailApi.updateUnfinishedShipmentDetail"
-    :apiCreate="UnfinishedShipmentDetailApi.createUnfinishedShipmentDetail"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
-
-  <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="UnfinishedShipmentDetail.allSchemas" />
-
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/unfinished-shipment-detail/import" :importTemplateData="importTemplateData" @success="importSuccess" />
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import { UnfinishedShipmentDetail,UnfinishedShipmentDetailRules } from './unfinishedShipmentDetail.data'
-import * as UnfinishedShipmentDetailApi from '@/api/wms/unfinishedShipmentDetail'
-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'
-
-defineOptions({ name: 'UnfinishedShipmentDetail' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(UnfinishedShipmentDetail.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: UnfinishedShipmentDetailApi.getUnfinishedShipmentDetailPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:unfinishedShipmentDetail:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:unfinishedShipmentDetail:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:unfinishedShipmentDetail: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:unfinishedShipmentDetail:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:unfinishedShipmentDetail: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 =UnfinishedShipmentDetail.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 UnfinishedShipmentDetailApi.createUnfinishedShipmentDetail(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await UnfinishedShipmentDetailApi.updateUnfinishedShipmentDetail(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicUnfinishedShipmentDetail')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await UnfinishedShipmentDetailApi.deleteUnfinishedShipmentDetail(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 UnfinishedShipmentDetailApi.exportUnfinishedShipmentDetail(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 UnfinishedShipmentDetailApi.importTemplate()
-})
-
-</script>
diff --git a/src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/unfinishedShipmentDetail.data.ts b/src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/unfinishedShipmentDetail.data.ts
deleted file mode 100644
index 5544bd352..000000000
--- a/src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/unfinishedShipmentDetail.data.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-
-// 表单校验
-export const UnfinishedShipmentDetailRules = reactive({
-  materialCode: [required],
-  materialName: [required],
-  backNumber: [required],
-  materialDescription: [required],
-  shipmentQuantity: [required],
-  unitPrice: [required],
-  lockedQuantity: [required],
-  available: [required],
-  concurrencyStamp: [required]
-})
-
-export const UnfinishedShipmentDetail = 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: 'backNumber',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isSearch: true
-  },
-  {
-    label: '物料描述',
-    field: 'itemDescription',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isSearch: true,
-    form: {
-      component: 'Editor',
-      componentProps: {
-        valueHtml: '',
-        height: 200
-      }
-    }
-  },
-  {
-    label: '发货数量',
-    field: 'shipmentQuantity',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
-  {
-    label: '销售单价',
-    field: 'unitPrice',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isSearch: true
-  },
-  {
-    label: '锁定数量',
-    field: 'lockedQuantity',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
-  // {
-  //   label: '是否可用',
-  //   field: 'available',
-  //   sort: 'custom',
-  //     dictType: DICT_TYPE.TRUE_FALSE,
-  //     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-  //   isSearch: true,
-  //               form: {
-  //                 component: 'Switch',
-  //                 value: 'TRUE',
-  //                 componentProps: {
-  //                   inactiveValue: 'FALSE',
-  //                   activeValue: 'TRUE'
-  //                 }
-  //               }
-  // },
-
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    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: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: true,
-  },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isForm: false,
-  //   table: {
-  //     width: 150,
-  //     fixed: 'right'
-  //   }
-  // }
-]))