diff --git a/src/api/wms/containerDetailRequest/index.ts b/src/api/wms/containerDetailRequest/index.ts
index a88d054ca..43ec7211f 100644
--- a/src/api/wms/containerDetailRequest/index.ts
+++ b/src/api/wms/containerDetailRequest/index.ts
@@ -18,6 +18,8 @@ export interface ContainerDetailRequestVO {
 
 // 查询器具管理申请子列表
 export const getContainerDetailRequestPage = async (params) => {
+  console.log(params);
+  
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -38,7 +40,7 @@ export const createContainerDetailRequest = async (data: ContainerDetailRequestV
 }
 
 // 修改器具管理申请子
-export const c = async (data: ContainerDetailRequestVO) => {
+export const updateContainerDetailRequest = async (data: ContainerDetailRequestVO) => {
   return await request.put({ url: `/wms/container-detail-request/update`, data })
 }
 
diff --git a/src/api/wms/containerRecordDetail/index.ts b/src/api/wms/containerRecordDetail/index.ts
new file mode 100644
index 000000000..e8993f74e
--- /dev/null
+++ b/src/api/wms/containerRecordDetail/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface ContainerRecordDetailVO {
+  id: number
+  masterId: number
+  number: string
+  containerNumber: string
+  fromLocationCode: string
+  toLocationCode: string
+  qty: number
+  uom: string
+  remark: string
+  siteId: string
+  concurrencyStamp: number
+  fromOwnerCode: string
+  toOwnerCode: string
+}
+
+// 查询器具管理记录子列表
+export const getContainerRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-record-detail/page`, params })
+  }
+}
+
+// 查询器具管理记录子详情
+export const getContainerRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/container-record-detail/get?id=` + id })
+}
+
+// 新增器具管理记录子
+export const createContainerRecordDetail = async (data: ContainerRecordDetailVO) => {
+  return await request.post({ url: `/wms/container-record-detail/create`, data })
+}
+
+// 修改器具管理记录子
+export const updateContainerRecordDetail = async (data: ContainerRecordDetailVO) => {
+  return await request.put({ url: `/wms/container-record-detail/update`, data })
+}
+
+// 删除器具管理记录子
+export const deleteContainerRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/container-record-detail/delete?id=` + id })
+}
+
+// 导出器具管理记录子 Excel
+export const exportContainerRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/container-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-record-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
index 14153366b..ca0f4f308 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
@@ -395,7 +395,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled:true
     },
   },
   // {
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index 9d28c0abc..00d2bdfb1 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -33,7 +33,7 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
+      <template #action="{ row,$index }">
         <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
@@ -67,7 +67,7 @@
     :detailAllSchemas="ContainerDetailRequest.allSchemas"
     :detailAllSchemasRules="ContainerDetailRequestRules"
     :apiCreate="ContainerDetailRequestApi.createContainerDetailRequest"
-    :apiUpdate="ContainerDetailRequestApi.createContainerDetailRequest"
+    :apiUpdate="ContainerDetailRequestApi.updateContainerDetailRequest"
     :apiPage="ContainerDetailRequestApi.getContainerDetailRequestPage"
     :apiDelete="ContainerDetailRequestApi.deleteContainerDetailRequest"
     fromeWhere="ContainerDetailRequest"
@@ -110,22 +110,7 @@ const { tableObject, tableMethods } = useTable({
 /**
  * 
  */
- if ( routeName.value == 'ScrapContainerManage') {
-  tableObject.params = {
-    type:'SCRAP'
-  }
-  ContainerMainRequest.allSchemas.formSchema.forEach(item=>{
-    if(item.field == 'type'){
-        item.value = "SCRAP"
-    }});    
-    ContainerDetailRequest.allSchemas.formSchema.forEach(item=>{
-    if(item.field == 'toInventoryStatus'){
-        item.value = "SCRAP"
-    }
-  });
-  businessType.value = 'ScrapContainerManage'
-  importFileName.value = '器具报废申请'
-} else if ( routeName.value == 'ReturnContainerManage') {
+ if ( routeName.value == 'ReturnContainerManage') {
   tableObject.params = {
     type:'RETURN'
   }
@@ -144,7 +129,6 @@ const { tableObject, tableMethods } = useTable({
         item.value = "MOVE"
     }});
   businessType.value = 'MoveContainerManage'
-  
   importFileName.value = '器具转移申请'
 } else if ( routeName.value == 'DeliverContainerManage') {
   tableObject.params = {
@@ -156,7 +140,7 @@ const { tableObject, tableMethods } = useTable({
         item.value = "DELIVER"
     }});
   businessType.value = 'DeliverContainerManage'
-  importFileName.value = '器具管理申请'
+  importFileName.value = '器具发运申请'
 } else if( routeName.value == 'ContainerManage'){
   businessType.value = 'ContainerManage'
   importFileName.value = '器具管理申请'
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
index 6c7faacb0..d30b7e402 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
@@ -1,4 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
 import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
@@ -7,26 +8,24 @@ export const ContainerRecordMainRules = reactive({
   concurrencyStamp: [required],
 })
 
+  // 获取当前操作人的部门
+  import { useUserStore } from '@/store/modules/user'
+  const userStore = useUserStore()
+  const userDept = userStore.userSelfInfo.dept
+   // id 转str 否则form回显匹配不到
+   userDept.id = userDept.id.toString()
+  const userDeptArray:any = [userDept]
+
 export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-  },
   {
     label: '单据号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    isForm: false,
+    table: {
+      width: 200
+    },
   },
   {
     label: '申请单号',
@@ -35,19 +34,32 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '状态',
-    field: 'status',
+    label: '类型',
+    field: 'type',
     sort: 'custom',
+    dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
+    dictClass: 'string',
     isSearch: true,
-    form: {
-      component: 'Radio'
+    isTable: true,
+    table: {
+      width: 120
     },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
   },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    isSearch: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '备注',
@@ -55,34 +67,63 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isTable:false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
   {
     label: '扩展属性',
     field: 'extraProperties',
     sort: 'custom',
-    isSearch: true,
+    isForm: false,
+    isTable: false
   },
   {
     label: '并发乐观锁',
     field: 'concurrencyStamp',
     sort: 'custom',
-    isSearch: true,
     form: {
       component: 'InputNumber',
       value: 0
     },
+    isForm: false,
+    isTable: false
   },
   {
     label: '地点ID',
     field: 'siteId',
     sort: 'custom',
-    isSearch: true,
+    isForm: false,
+    table: {
+      width: 100
+    },
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -91,13 +132,149 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 200
+    },
     isForm: false,
   },
   {
-    label: '部门',
-    field: 'departmentCode',
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerRecordDetailRules = reactive({
+  fromLocationCode: [required],
+  toLocationCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
     sort: 'custom',
     isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom'
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '目标库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    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')]
+      }
+    },
+    table: {
+      width: 200
+    },
+    isForm: false,
+    isTableForm: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
   },
   {
     label: '操作',
@@ -108,4 +285,4 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
+]))
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
index c8321bf5d..02f080e43 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@@ -27,13 +27,13 @@
       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>
+      <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 #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -41,66 +41,102 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
-    @success="formsSuccess"
+    @success="getList"
     :rules="ContainerRecordMainRules"
     :formAllSchemas="ContainerRecordMain.allSchemas"
-    :apiUpdate="ContainerRecordMainApi.updateContainerRecordMain"
-    :apiCreate="ContainerRecordMainApi.createContainerRecordMain"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
+    :tableAllSchemas="ContainerRecordDetail.allSchemas"
+    :tableFormRules="ContainerRecordDetailRules"
+    :isBusiness="true"
   />
   
-  <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ContainerRecordMain.allSchemas" />
+   <!-- 详情 -->
+   <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerRecordMain.allSchemas"
+    :detailAllSchemas="ContainerRecordDetail.allSchemas"
+    :detailAllSchemasRules="ContainerRecordDetailRules"
+    :apiPage="ContainerRecordDetailApi.getContainerRecordDetailPage"
+  />
 
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/container-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
-</template>
+  </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ContainerRecordMain,ContainerRecordMainRules } from './containerRecordMain.data'
+import { ContainerRecordMain,ContainerRecordMainRules,ContainerRecordDetail,ContainerRecordDetailRules } from './containerRecordMain.data'
 import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
+import * as ContainerRecordDetailApi from '@/api/wms/containerRecordDetail'
 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 { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 defineOptions({ name: 'ContainerRecordMain' })
-
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
+const businessType = ref()
+const importFileName = ref()
 const tableColumns = ref(ContainerRecordMain.allSchemas.tableColumns)
 
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
-  })
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ * 
+ */
+ if ( routeName.value == 'ReturnContainerManage') {
+  tableObject.params = {
+    type:'RETURN'
+  }
+  ContainerRecordMain.allSchemas.formSchema.forEach(item=>{
+    if(item.field == 'type'){
+        item.value = "RETURN"
+    }});
+  businessType.value = 'ReturnContainerManage'
+  importFileName.value = '器具返回申请'
+} else if ( routeName.value == 'MoveContainerManage') {
+  tableObject.params = {
+    type:'MOVE'
+  }
+  ContainerRecordMain.allSchemas.formSchema.forEach(item=>{
+    if(item.field == 'type'){
+        item.value = "MOVE"
+    }});
+  businessType.value = 'MoveContainerManage'
+  importFileName.value = '器具转移申请'
+} else if ( routeName.value == 'DeliverContainerManage') {
+  tableObject.params = {
+    type: 'DELIVER',
+  }
+  //主表字段赋值
+  ContainerRecordMain.allSchemas.formSchema.forEach(item=>{
+    if(item.field == 'type'){
+        item.value = "DELIVER"
+    }});
+  businessType.value = 'DeliverContainerManage'
+  importFileName.value = '器具发运申请'
+} else if( routeName.value == 'ContainerManage'){
+  businessType.value = 'ContainerManage'
+  importFileName.value = '器具管理申请'
 }
 
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-const { tableObject, tableMethods } = useTable({
-  getListApi: ContainerRecordMainApi.getContainerRecordMainPage // 分页接口
-})
-
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:containerRecordMain:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:containerRecordMain:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:containerRecordMain:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -119,8 +155,6 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
@@ -132,10 +166,16 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:containerRecordMain:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:containerRecordMain:delete'}), // 删除
-]
+const butttondata = (row,$index) => {
+const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
+    return [
+        // defaultButtons.mainListEditBtn({hasPermi:'wms:container-record-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-record-main:delete'}), // 删除
+    ]
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -146,42 +186,22 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+// 获取部门 用于详情 部门回显
+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)
+}
+
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =ContainerRecordMain.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 ContainerRecordMainApi.createContainerRecordMain(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await ContainerRecordMainApi.updateContainerRecordMain(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, 'basicContainerRecordMain')
-}
-
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -211,21 +231,6 @@ const handleExport = async () => {
   }
 }
 
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '器具管理记录主导入模版.xlsx'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -238,7 +243,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await ContainerRecordMainApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 534c99432..42a6941c5 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -67,7 +67,7 @@
     :detailAllSchemas="ContainerDetailRequest.allSchemas"
     :detailAllSchemasRules="ContainerDetailRequestRules"
     :apiCreate="ContainerDetailRequestApi.createContainerDetailRequest"
-    :apiUpdate="ContainerDetailRequestApi.createContainerDetailRequest"
+    :apiUpdate="ContainerDetailRequestApi.updateContainerDetailRequest"
     :apiPage="ContainerDetailRequestApi.getContainerDetailRequestPage"
     :apiDelete="ContainerDetailRequestApi.deleteContainerDetailRequest"
     fromeWhere="ContainerDetailRequest"
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
new file mode 100644
index 000000000..167c9a215
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -0,0 +1,486 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ContainerMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerMainRequest.allSchemas"
+      :detailAllSchemas="ContainerDetailRequest.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,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerMainRequestRules"
+    :formAllSchemas="ContainerMainRequest.allSchemas"
+    :tableAllSchemas="ContainerDetailRequest.allSchemas"
+    :tableFormRules="ContainerDetailRequestRules"
+    :tableData="tableData"
+    :apiUpdate="ContainerMainRequestApi.updateContainerMainRequest"
+    :apiCreate="ContainerMainRequestApi.createContainerMainRequest"
+    :isBusiness="true"
+    fromeWhere="ContainerMainRequest"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    :isShowButton = isShowButton
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerMainRequest.allSchemas"
+    :detailAllSchemas="ContainerDetailRequest.allSchemas"
+    :detailAllSchemasRules="ContainerDetailRequestRules"
+    :apiCreate="ContainerDetailRequestApi.createContainerDetailRequest"
+    :apiUpdate="ContainerDetailRequestApi.updateContainerDetailRequest"
+    :apiPage="ContainerDetailRequestApi.getContainerDetailRequestPage"
+    :apiDelete="ContainerDetailRequestApi.deleteContainerDetailRequest"
+    fromeWhere="ContainerDetailRequest"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="trueFalse"
+    :detailButtonIsShowDelete="trueFalse"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/container-main-request/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerMainRequest,ContainerMainRequestRules,ContainerDetailRequest,ContainerDetailRequestRules } from './scrapContainerMainRequest.data'
+import * as ContainerMainRequestApi from '@/api/wms/containerMainRequest'
+import * as ContainerDetailRequestApi from '@/api/wms/containerDetailRequest'
+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: 'ScrapContainerManage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const businessType = ref()
+const toLocationCode = ref()
+const fromLocationCode = ref()
+const importFileName = ref()
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ContainerMainRequest.allSchemas.tableColumns)
+console.log(99 ,  routeName.value)
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerDetailRequestApi.getContainerDetailRequestPage // 分页接口
+})
+// 判断 路由名称 进行条件过滤
+/**
+ * 
+ */
+ if ( routeName.value == 'ScrapContainerManage') {
+  tableObject.params = {
+    type:'SCRAP'
+  }
+  ContainerMainRequest.allSchemas.formSchema.forEach(item=>{
+    if(item.field == 'type'){
+        item.value = "SCRAP"
+    }});    
+  businessType.value = 'ScrapContainerManage'
+  importFileName.value = '器具报废申请'
+}
+
+//定义  展示子表数据时是否显示新增/修改/删除按钮
+const trueFalse = ref(false)
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if(formField == 'containerNumber') {
+        row['containerNumber'] = val[0]['code']
+        row['uom'] = val[0]['uom']
+        row['toInventoryStatus'] = 'OK'
+    }else if(formField == 'toLocationCode'){
+      row['toLocationCode'] = val[0]['code']
+    }else {
+      row[formField] = val[0][searchField]
+    }
+    }
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'containerNumber') {
+      setV['containerNumber'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    }else if(formField == 'toLocationCode'){
+      setV['toLocationCode'] = val[0]['code']
+    }else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 修改 tableform 属性
+ContainerDetailRequest.allSchemas.tableFormColumns.map(item => {
+  
+  if(item.field == 'containerNumber') {
+  if (fromLocationCode.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      }
+    ]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }
+    ]
+    } else {
+      delete item.tableForm.searchCondition
+    }
+  }
+  if(item.field == "toLocationCode"){
+    if (toLocationCode.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }]
+    }else if (toLocationCode.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }]
+    }
+  }
+})
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:container-main-request:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:container-main-request:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-main-request: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 = (row,$index) => {
+const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:container-main-request:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main-request:delete'}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.close(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.reAdd(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.submit(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.refused(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.agree(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要 处理吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.handle(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else 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)
+}
+
+const isShowButton = ref(true)
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ContainerDetailRequest.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+  if(item.field == 'toInventoryStatus'){
+    tableFormKeys[item.field] = "SCRAP"
+    }
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
+// form表单提交
+const submitForm = async (formType,data) => {
+  data.subList = tableData.value // 拼接子表数据参数  
+  data.subList.forEach(item => {
+    if(item.qty == 0){
+      message.error(`到数量不能为0!`)
+      flag.value = true
+      return;
+    } 
+  })
+  try {
+    if (formType === 'create') {
+      data.businessType = businessType.value
+      console.log(data.businessType,999);
+      
+    await ContainerMainRequestApi.createContainerMainRequest(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ContainerMainRequestApi.updateContainerMainRequest(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+} finally {
+  basicFormRef.value.formLoading = false
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerMainRequest')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ContainerMainRequestApi.deleteContainerMainRequest(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 ContainerMainRequestApi.exportContainerMainRequest(tableObject.params)
+    download.excel(data, '器具管理申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: 'importFileName.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
new file mode 100644
index 000000000..3c49924d7
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -0,0 +1,520 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as confgiApi from '@/api/infra/config'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+
+// 表单校验
+export const ContainerMainRequestRules = reactive({
+  type: [
+    { required: true, message: '请选择类型', trigger: 'change' },
+  ],
+  concurrencyStamp: [required],
+})
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'ContainerRequest'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+
+const confgiData = await confgiApi.queryByKey("containerManageRequestScrapLocationCode")
+
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
+
+export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 100
+    },
+  }, {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isTable: false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    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')]
+      }
+    },
+    table: {
+      width: 200
+    },
+    isForm: false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 100
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerDetailRequestRules = reactive({
+  fromLocationCode: [required],
+  toLocationCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择器具号',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectConfigToBalance,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择器具号',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectConfigToBalance,
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '目标库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'code',
+        value: confgiData.locationCode,
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'code',
+          value: confgiData.locationCode,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled:true
+    },
+  },
+  // {
+  //   label: '从数量',
+  //   field: 'fromQty',
+  //   sort: 'custom',
+  //   tableForm: {
+  //     disabled: true,
+  //   },
+  // },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    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')]
+      }
+    },
+    table: {
+      width: 200
+    },
+    isForm: false,
+    isTableForm: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+