diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts
index 00f348d3e..0ccc0f3ee 100644
--- a/src/api/mes/orderDay/index.ts
+++ b/src/api/mes/orderDay/index.ts
@@ -99,9 +99,9 @@ export const getPlanDevices = async (params)  => {
 
 ///发布计划
 export const publishPlan = async (data: OrderDayVO)  => {
-  return await request.post({ url: `/mes/orderday/publishPlan`,data })
+  return await request.postOriginal({ url: `/mes/orderday/publishPlan`,data })
 }
 //终止计划
-export const stopPlan = async (params)  => {
-  return await request.post({ url: `/mes/orderday/stopPlan`,params })
+export const stopPlan = async (id)  => {
+  return await request.post({ url: `/mes/orderday/stopPlan/`+id })
 }
\ No newline at end of file
diff --git a/src/api/mes/productOffline/index.ts b/src/api/mes/productOffline/index.ts
index c5434f931..8d504ad7e 100644
--- a/src/api/mes/productOffline/index.ts
+++ b/src/api/mes/productOffline/index.ts
@@ -64,8 +64,8 @@ export const getworkSchedulingPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/mes/work-scheduling/senior', data })
+    return await request.post({ url: '/mes/workScheduling/senior', data })
   } else {
-    return await request.get({ url: `/mes/work-scheduling/page`, params })
+    return await request.get({ url: `/mes/workScheduling/page`, params })
   }
 }
diff --git a/src/api/mes/workScheduling/index.ts b/src/api/mes/workScheduling/index.ts
index 08591d25b..d17a72c52 100644
--- a/src/api/mes/workScheduling/index.ts
+++ b/src/api/mes/workScheduling/index.ts
@@ -9,38 +9,42 @@ export const getWorkSchedulingPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/mes/work-scheduling/senior', data })
+    return await request.post({ url: '/mes/workScheduling/senior', data })
   } else {
-    return await request.get({ url: `/mes/work-scheduling/page`, params })
+    return await request.get({ url: `/mes/workScheduling/page`, params })
   }
 }
 
 // 查询生产任务排产详情
 export const getWorkScheduling = async (id: number) => {
-  return await request.get({ url: `/mes/work-scheduling/get?id=` + id })
+  return await request.get({ url: `/mes/workScheduling/get?id=` + id })
 }
 
 // 新增生产任务排产
 export const createWorkScheduling = async (data: WorkSchedulingVO) => {
-  return await request.post({ url: `/mes/work-scheduling/create`, data })
+  return await request.post({ url: `/mes/workScheduling/create`, data })
 }
 
 // 修改生产任务排产
 export const updateWorkScheduling = async (data: WorkSchedulingVO) => {
-  return await request.put({ url: `/mes/work-scheduling/update`, data })
+  return await request.put({ url: `/mes/workScheduling/update`, data })
+}
+// 更改生产任务状态
+export const updateWorkSchedulingStatus = async (data: any) => {
+  return await request.put({ url: `/mes/workScheduling/updateStatus`, data })
 }
 
 // 删除生产任务排产
 export const deleteWorkScheduling = async (id: number) => {
-  return await request.delete({ url: `/mes/work-scheduling/delete?id=` + id })
+  return await request.delete({ url: `/mes/workScheduling/delete?id=` + id })
 }
 
 // 导出生产任务排产 Excel
 export const exportWorkScheduling = async (params) => {
-  return await request.download({ url: `/mes/work-scheduling/export-excel`, params })
+  return await request.download({ url: `/mes/workScheduling/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/mes/work-scheduling/get-import-template' })
+  return request.download({ url: '/mes/workScheduling/get-import-template' })
 }
\ No newline at end of file
diff --git a/src/components/SearchTable/index.ts b/src/components/SearchTable/index.ts
index 28289593f..4293a0555 100644
--- a/src/components/SearchTable/index.ts
+++ b/src/components/SearchTable/index.ts
@@ -1,3 +1,3 @@
 import SearchTable from './src/SearchTable.vue'
 
-export { SearchTable }
+export { SearchTable}
diff --git a/src/components/SearchTableV2/index.ts b/src/components/SearchTableV2/index.ts
new file mode 100644
index 000000000..655979c12
--- /dev/null
+++ b/src/components/SearchTableV2/index.ts
@@ -0,0 +1,3 @@
+import SearchTable from './src/SearchTableV2.vue'
+
+export { SearchTable }
diff --git a/src/components/SearchTableV2/src/SearchTableV2.vue b/src/components/SearchTableV2/src/SearchTableV2.vue
new file mode 100644
index 000000000..cfee305e9
--- /dev/null
+++ b/src/components/SearchTableV2/src/SearchTableV2.vue
@@ -0,0 +1,187 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="'80%'">
+    <!-- 搜索工作栏 -->
+    <!-- <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" /> -->
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      :routeName="routeName"
+      @searchFormClick="searchFormClick"
+      :allSchemas="allSchemasRef"
+    />
+    <ContentWrap>
+      <Table
+        ref="searchTableRef"
+        :columns="tableColumns"
+        :data="tableObjectRef.tableList"
+        :loading="tableObjectRef.loading"
+        :pagination="{
+          total: tableObjectRef.total
+        }"
+        v-model:pageSize="tableObjectRef.pageSize"
+        v-model:currentPage="tableObjectRef.currentPage"
+        v-model:sort="tableObjectRef.sort"
+        :selection="true"
+        :reserveSelection="true"
+        row-key="id"
+      />
+    </ContentWrap>
+    <template #footer>
+      <div class="flex items-center">
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+        <el-button @click="searchDialogVisible = false">取 消</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+
+const searchDialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultFilterBtn(null), // 筛选
+]
+
+/** 打开弹窗 */
+const getListRef = ref()
+const setSearchParamsRef = ref()
+const tableObjectRef = ref()
+const getPage:any = ref()
+const searchSchema = ref()
+const tableColumns = ref()
+const formFieldRef = ref()
+const searchFieldRef = ref()
+const typeRef = ref()
+const rowRef = ref()
+const allSchemasRef = ref()
+const multipleBol = ref(false)
+const searchConditionRef = ref()
+
+const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
+  dialogTitle.value = titleName
+  tableObjectRef.value = tableObject
+  searchDialogVisible.value = true
+  multipleBol.value = multiple
+  allSchemasRef.value = allSchemas
+  searchSchema.value = allSchemas.searchSchema
+  tableColumns.value = allSchemas.tableColumns
+}
+const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any ) => {
+  searchDialogVisible.value = true
+  formFieldRef.value = formField
+  searchFieldRef.value = searchField
+  allSchemasRef.value = allSchemas
+  searchSchema.value = allSchemas.searchSchema
+  tableColumns.value = allSchemas.tableColumns.filter(item => (item.field !== 'action'))
+  getPage.value = getApiPage
+  typeRef.value = type
+  rowRef.value = row
+  multipleBol.value = multiple
+  // dialogTitle.value = t('action.' + type)
+  dialogTitle.value = titleName
+  const {tableObject, tableMethods } = useTable({
+    getListApi: getPage.value // 分页接口
+  })
+  tableObjectRef.value = tableObject
+  searchConditionRef.value = searchCondition
+  if (searchCondition) tableObjectRef.value.params = searchCondition;
+
+  // 获得表格的各种操作
+  const { getList } = tableMethods
+  // setSearchParamsRef.value = setSearchParams
+  setSearchParamsRef.value = tableObject.params
+  getListRef.value = getList
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  console.log(99, rowRef.value)
+  console.log(100, searchData)
+  console.log(101, searchConditionRef.value)
+  // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
+  // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
+  if (searchData.filters) {
+    if (searchConditionRef.value.filters) {
+      Object.keys(searchConditionRef.value.filters).forEach(key => {
+        searchData.filters.push(searchConditionRef.value.filters[key])
+      });
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
+        searchData.filters.push({
+          action: "==",
+          column: key,
+          value: searchConditionRef.value[key]
+        })
+      });
+    }
+  } else {
+    if (searchConditionRef.value.filters) {
+      searchData.filters = searchConditionRef.value.filters
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
+        searchData.filters = [{
+          action: "==",
+          column: key,
+          value: searchConditionRef.value[key]
+        }]
+      });
+    }
+  }
+  tableObjectRef.value.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getListRef.value() // 刷新当前列表
+}
+
+defineExpose({ open,openData }) // 提供 open 方法，用于打开弹窗
+
+// Table 组件 ref
+const searchTableRef = ref()
+
+/** 提交表单 */
+const emit = defineEmits(['searchTableSuccess']) // 定义 searchTableSuccess 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  const selections = searchTableRef.value.selections
+  // 如果不是多选的
+  if(!multipleBol.value){
+    if(selections.length > 1 || selections.length == 0) {
+      message.warning('请选择一条数据！')
+      formLoading.value = false
+      return
+    }
+    // 多选
+  }else{
+    if(selections.length == 0) {
+      message.warning('至少选择一条数据！')
+      formLoading.value = false
+      return
+    }
+  }
+ 
+  try {
+    searchDialogVisible.value = false
+    // 发送操作成功的事件
+    emit('searchTableSuccess', formFieldRef.value, searchFieldRef.value, selections, typeRef.value, rowRef.value)
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+<style scoped lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/views/mes/orderDay/components/BasicFormV2.vue b/src/views/mes/orderDay/components/BasicFormV2.vue
index a155e9cdc..8715c9abb 100644
--- a/src/views/mes/orderDay/components/BasicFormV2.vue
+++ b/src/views/mes/orderDay/components/BasicFormV2.vue
@@ -4,11 +4,11 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
+    :vLoading="formLoading"
   >
   <div style="max-height: 60vh;overflow-y: auto;">
     <Form
-      ref="formRef"
-      v-loading="formLoading"
+      ref="formRef" 
       :rules="rules"
       :schema="formSchema"
       :is-col="true"
@@ -23,7 +23,7 @@
   <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
 </template>
 <script setup lang="ts">
-import { SearchTable } from '@/components/SearchTable'
+import { SearchTable } from '@/components/SearchTableV2'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 
@@ -304,7 +304,9 @@ if (props.isShowFooterButtton) {
 const buttonBaseClick = (val) => {
   // 保存
   if (val == 'save') {
+    
     submitForm()
+    
   }
   // 关闭
   else if (val == 'close') {
diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 7ca6b31d2..cc2d11429 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -4,6 +4,7 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
+    :vLoading="formLoading"
   >
     <ContentWrap>
       <Descriptions
@@ -178,7 +179,7 @@
       </el-dialog>
     </ContentWrap>
     <template #footer>
-      <el-button @click="publishPlan">发布计划</el-button>
+      <el-button @click="publishPlan" >发布计划</el-button>
     </template>
     <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess" />
   </Dialog>
@@ -211,11 +212,11 @@ const graph = ref<Graph>()
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const activeName = ref('process')
-const loading = ref(true)
+const formLoading = ref(false)
 const dialogFormVisibleUser = ref(false)
 const processData = ref([])
 const processCode = ref('')
-
+//const isPublish=ref(false)
 const queryParams:orderDayconfigApi.OrderDayQueryParamVo=ref()
 const props = defineProps({
   // 查询弹窗是否显示筛选按钮
@@ -411,7 +412,26 @@ const opensearchTable = (
     true
   )
 }
-const publishPlan= async ()=>{
+const publishPlan=()=>{
+     message.confirm("确认发布当前计划？","question").then(async () => {
+      //isPublish.value=true
+      //loading.value = true,
+      try{formLoading.value=true
+      doPublishPlan() }finally{
+        formLoading.value=false;
+      }
+     // loading.value = false,
+      dialogVisible.value = false,
+      //isPublish.value=false,
+      emit('close')
+     }).catch(() => {
+      message.info("已取消发布")
+     })
+     
+    
+}
+const doPublishPlan=  ()=>{
+  
   let data ={
   updateId: detailData.value.id,
   status: detailData.value.status,
@@ -432,8 +452,14 @@ const publishPlan= async ()=>{
   endTime: detailData.value.endTime,
   taskMode: detailData.value.taskMode
 }
-  console.log("-------",data)
-  await OrderDayApi.publishPlan(data)
+  //console.log("-------",data)
+  let res = OrderDayApi.publishPlan(data)
+  if(res.code==0){
+    message.success("计划发布成功")
+  }else {
+    message.error(res.msg)
+  }
+
 }
 // 弹层确定返回所选数据
 const searchTableSuccess = (formField, searchField, val, type, row) => {
@@ -623,6 +649,10 @@ const getTeamList = async (params:any) => {
 
 defineOptions({ name: 'SechledDetail' })
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+// 传递给父类
+const emit = defineEmits([
+  'close'
+])
 </script>
 <style lang="scss">
 .el-drawer__body {
diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index a241bf85b..a4b55b138 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -57,11 +57,12 @@
     :isBusiness="false"
     :isSearchFilterButtonHide="true"
     @onChange="valueChange"
+   
   />
 
   <!-- 详情 -->
   <orderDetail ref="detailRef" :all-schemas="OrderDay.allSchemas" />
-  <scheduleDetail ref="scheduleDetailRef"  :all-schemas="OrderDay.allSchemas" :basicFormWidth="75"/>
+  <scheduleDetail ref="scheduleDetailRef"  :all-schemas="OrderDay.allSchemas" :basicFormWidth="75" @close="publishClosed" />
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
@@ -81,8 +82,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import orderDetail from './components/orderDetail.vue'
 import scheduleDetail from './components/schedule.vue'
-import { Loading } from 'node_modules/element-plus/es/components/loading/src/service'
-import { loadavg } from 'os'
+
 defineOptions({ name: 'MesOrderDay' })
 
 const message = useMessage() // 消息弹窗
@@ -195,6 +195,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
+const publishClosed=()=>{
+    //console.log('publishClosed')
+    getList()
+}
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
   //console.log('row',row)
@@ -206,6 +210,7 @@ const isShowMainButton = (row,val) => {
 }
 // 列表-操作按钮
 // 列表-操作按钮
+//TERMINALE("4", "已终止"),PROCESSING("3", "生产中"),PUBLISHED("2", "待开工"),WAITSECHUDLE("1", "待排产"),CANCELED("-2", "已取消"),WAITREADY("-1", "待齐套");
 const butttondata = (row) => {
      //console.log('row2',row)
     return [
@@ -227,11 +232,11 @@ const butttondata = (row) => {
     //   hasPermi: ''}), // 路由设置
       defaultButtons.mainListHandleBtn({label: '终止',
       name: 'stopPlan',
-      hide: isShowMainButton(row,['1','2','3']),
+      hide: isShowMainButton(row,['-1','1','2','3']),
       type: 'warning',
       icon: '',
       color: '',
-      hasPermi: ''}), // 路由设置
+      hasPermi: 'mes:orderDay:update'}), // 路由设置
     ]
 }
 
@@ -244,6 +249,8 @@ const buttonTableClick = async (val, row) => {
     handleDelete(row.id)
   } else if(val=='publish'){  //发布计划
     openScheduledDetail( '发布计划', row,row.planNoDay)
+  }else if(val=='stopPlan'){  //终止计划
+    stopPlan(row.id)
   }
 }
 
@@ -255,25 +262,23 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-
-  var isHave =OrderDay.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 OrderDayApi.createOrderDay(data)
-    message.success(t('common.createSuccess'))
+    let ret=await OrderDayApi.createOrderDay(data)
+    if(ret===undefined || ret===null){
+      message.error(t('common.networkError'))
+    }else{
+      message.success(t('common.createSuccess'))
+    }
+   
   } else {
-    await OrderDayApi.updateOrderDay(data)
-    message.success(t('common.updateSuccess'))
+    let ret=await OrderDayApi.updateOrderDay(data)
+    if(ret.code==0){
+      message.success(t('common.updateSuccess'))
+    }else{
+      message.error(t('common.networkError'))
+    }
+    
   }
   
   basicFormRef.value.dialogVisible = false
@@ -318,7 +323,10 @@ const handleExport = async () => {
     exportLoading.value = false
   }
 }
-
+const stopPlan = async (id) => {
+   await OrderDayApi.stopPlan(id)
+   getList()
+}
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {
diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts
index a67084f4d..23b0177c5 100644
--- a/src/views/mes/orderDay/orderDay.data.ts
+++ b/src/views/mes/orderDay/orderDay.data.ts
@@ -263,7 +263,9 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'planDate',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
+    isForm:false,
+    isTable:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -286,11 +288,12 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     required: true,
     form: {
-      component: 'TimePicker',
+      component: 'DatePicker',
       componentProps: {
-        type: 'time',
-        dateFormat: 'HH:mm',
-        //valueFormat: 'x',
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        timeFormat:"HH:mm"
       }
     },
   },
@@ -301,10 +304,12 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     isReadonly:true,
     form: {
-      component: 'TimePicker',
+      component: 'DatePicker',
       componentProps: {
-        type: 'time',
-        dateFormat: 'HH:mm',
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        timeFormat:"HH:mm"
       }
     },
   },
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index d41e3d2bc..59b9e7fe0 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -27,13 +27,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #planMaserCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.planMaserCode)">
+      <template #schedulingCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
           <span>{{ row.planMaserCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -81,6 +81,7 @@ 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.vue'
+import { async } from '@antv/x6/lib/registry/marker/async'
 
 defineOptions({ name: 'MesWorkScheduling' })
 
@@ -100,7 +101,15 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     formRef.setValues(setV)
   })
 }
-
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  //console.log('row',row)
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -115,9 +124,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:workScheduling:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:workScheduling:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:workScheduling:export'}), // 导出
+  //defaultButtons.defaultAddBtn({hasPermi:'mes:workScheduling:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:workScheduling:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:workScheduling:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -146,19 +155,36 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
+// ONERROR("-3", "异常"),
+//     TERMINALE("-2", "已终止"),
+//     WAITBEGIN("-1", "待齐套"),
+//     READYTODO("0", "待开工"),
+//     WORKING("1", "生产中"),
+//     WAITMATERIAL("2", "待配料"),
+//     PAUSE("3", "已暂停"),
+//     WAITREPORT("4", "待报工"),
+//     WAITFCHECK("5", "待质检"),
+//     FINISHED("9", "已完成");
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:workScheduling:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:workScheduling:delete'}), // 删除
-]
+const butttondata=(row) =>{ return [
+  defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // 删除
+  defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), // 
+  defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), 
+  defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}), 
+  //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), // 
+]}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+  } else if (val == 'terminate') { // 终止
+    changeBillStatus(row,"-2")
+  }else if (val == 'pause') { // 暂停
+    changeBillStatus(row,"3")
+  }else if (val == 'resume') { // 恢复
+    changeBillStatus(row,"0")
   }
 }
 
@@ -197,18 +223,15 @@ const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkScheduling')
 }
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await WorkSchedulingApi.deleteWorkScheduling(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
+//  改变工单状态
+const changeBillStatus=async(row,status)=>{
+    ///message.alertWarning("暂不支持该功能")
+    let data={
+      id:row.id,
+      status:status
+    }
+     WorkSchedulingApi.updateWorkSchedulingStatus(data);
+     getList()
 }
 
 /** 导出按钮操作 */
diff --git a/src/views/mes/workScheduling/workScheduling.data.ts b/src/views/mes/workScheduling/workScheduling.data.ts
index 3201a4e1f..81b8a9224 100644
--- a/src/views/mes/workScheduling/workScheduling.data.ts
+++ b/src/views/mes/workScheduling/workScheduling.data.ts
@@ -41,17 +41,16 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
   },
   {
     label: '计划编号',
     field: 'planMaserCode',
     sort: 'custom',
     isSearch: true,
-    isForm: false,
+    isForm: true,
   },
   {
-    label: '任务编号',
+    label: '工单编号',
     field: 'schedulingCode',
     sort: 'custom',
     isSearch: true,
@@ -89,7 +88,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划数量',
     field: 'planCount',
     sort: 'custom',
-    isForm: false,
+    isForm: true,
   },
   {
     label: '完工数量',
@@ -114,6 +113,12 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'flagDo',
     sort: 'custom',
     isSearch: true,
+    isForm:false,
+    dictType: DICT_TYPE.MESDO_STATUS,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+    },
   },
   {
     label: '当前工序',
@@ -122,23 +127,30 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '当前任务号',
-    field: 'workingTaskSort',
+    label: '加工序号',
+    field: 'workSort',
     sort: 'custom',
     isForm: false,
   },
   {
-    label: '工单模式',
-    field: 'formType',
+    label: '当前任务号',
+    field: 'workingTaskSort',
     sort: 'custom',
-    isForm: false,
+    isForm: true,
   },
+  
   {
-    label: '生产序号',
-    field: 'workSort',
+    label: '工单模式',
+    field: 'formType',
     sort: 'custom',
-    isForm: false,
+    isForm: true,
+    dictType: DICT_TYPE.MES_WORKBILL_MODEL,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+    },
   },
+  
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 530508ffc..4358a6a89 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -13,58 +13,44 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true,
   },
   {
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 180
     },
+    isTable: false,
   },
   {
-    label: '车间代码',
-    field: 'workShopCode',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '生产线代码',
-    field: 'detailProductionLineCode',
+    label: '车间代码',
+    field: 'workShopCode',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '工位代码',
-    field: 'detailWorkStationCode',
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -77,6 +63,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -105,6 +92,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '过期时间',
@@ -117,6 +105,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -126,6 +115,46 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '生产线代码',
+    field: 'detailProductionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '工位代码',
+    field: 'detailWorkStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -137,6 +166,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -153,18 +183,10 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '优先级',
     field: 'priority',
@@ -172,6 +194,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
     }
@@ -183,6 +206,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
     }
@@ -194,6 +218,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接人用户名',
@@ -202,6 +227,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接时间',
@@ -214,6 +240,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -230,6 +257,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '完成时间',
@@ -242,6 +270,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -256,7 +285,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -267,7 +296,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -280,6 +309,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -288,6 +318,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -300,6 +331,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -316,6 +348,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -324,6 +357,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区代码范围',
@@ -332,17 +366,18 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '使用在途库',
     field: 'useOnTheWayLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -357,7 +392,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -376,7 +411,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -395,7 +430,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -414,7 +449,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -433,7 +468,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -452,7 +487,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -471,7 +506,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -490,7 +525,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -509,7 +544,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -528,7 +563,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -620,6 +655,8 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '工位代码',
@@ -628,138 +665,155 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    sortTableDefault:5,
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:5,
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:5,
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable:false,
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:3,
+    sortTableDefault:4,
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '采购订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
-    label: '物料描述1',
-    field: 'itemDesc1',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
-    label: '物料描述2',
-    field: 'itemDesc2',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
+    sortSearchDefault:2,
+    isSearch: true,
+    sortTableDefault:3,
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
-    label: '供应商计量数量',
-    field: 'supplierQty',
+    label: '物料描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
+    hiddenInMain: true,
   },
   {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '物料描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '项目代码',
@@ -768,6 +822,7 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '数量',
@@ -778,7 +833,8 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain: true,
   },
   {
     label: '计量单位',
@@ -790,6 +846,7 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:6,
   },
   {
     label: '单据号',
@@ -798,6 +855,7 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
   },
   {
     label: '备注',
@@ -806,6 +864,25 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -818,6 +895,7 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -834,23 +912,35 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '供应商计量数量',
+    field: 'supplierQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true,
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
+  
+ 
 ]))
 
 //表单校验
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index 96b413cba..8b5e1d6ca 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -13,8 +13,21 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -22,7 +35,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '任务单号',
@@ -31,7 +44,16 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
   },
   {
     label: '车间代码',
@@ -40,6 +62,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -48,6 +71,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '入库事务类型',
@@ -56,6 +80,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '执行时间',
@@ -68,6 +93,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -84,6 +110,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -109,6 +136,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -129,6 +157,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -145,13 +174,14 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -164,6 +194,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -172,6 +203,16 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -184,6 +225,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -193,14 +235,6 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   // {
   //   label: '代码',
   //   field: 'code',
@@ -216,13 +250,14 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -231,6 +266,9 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区代码范围',
     field: 'fromAreaCodes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -243,13 +281,14 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -262,13 +301,14 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '使用在途库',
     field: 'useOnTheWayLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -287,8 +327,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -302,6 +341,24 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '包装号',   //  子表数据 只是为了展示
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '批次',     //  子表数据 只是为了展示
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
 ]))
 
 //表单校验
@@ -361,127 +418,160 @@ export const IssueRecordMainRules = reactive({
  */
 export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
-    field: 'productionLineCode',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '工位代码',
-    field: 'workStationCode',
+    label: '到包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:9,
   },
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '从批次',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortSearchDefault:3,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '到批次',
+    field: 'toBatch',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortSearchDefault:4,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从包装号',
-    field: 'fromPackingNumber',
+    label: '采购订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
-    label: '从器具号',
-    field: 'fromContainerNumber',
+    label: '生产线代码',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false
   },
   {
-    label: '到器具号',
-    field: 'toContainerNumber',
+    label: '工位代码',
+    field: 'workStationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false
   },
   {
-    label: '从批次',
-    field: 'fromBatch',
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false
   },
+  
   {
-    label: '到批次',
-    field: 'toBatch',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '从货主代码',
+    field: 'fromOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '从库位组代码',
@@ -490,23 +580,45 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
+    label: '从库区代码',
+    field: 'fromAreaCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
-    label: '从库区代码',
-    field: 'fromAreaCode',
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
+  
   {
     label: '到库区代码',
     field: 'toAreaCode',
@@ -514,6 +626,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -522,6 +635,8 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
+
   },
   {
     label: '物料代码',
@@ -530,22 +645,28 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:2,
+    sortTableDefault:4,
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:4,
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
   {
     label: '创建时间',
@@ -558,6 +679,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -568,12 +690,13 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述1',
@@ -582,6 +705,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述2',
@@ -590,6 +714,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -598,6 +723,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -606,18 +732,40 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
   },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+  },
+  
   // {
   //   label: '代码',
   //   field: 'code',
@@ -626,17 +774,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   // {
   //   label: '任务明细ID',
   //   field: 'jobDetailId',
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index eb4fe8576..0efea8921 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -54,6 +54,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortSearchDefault:1,
   },
   {
     label: '车间代码',
@@ -62,6 +63,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -84,13 +86,13 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
     isForm:false,
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:1,
     form: {
       value: '1',
       componentProps: {
@@ -109,6 +111,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -130,6 +133,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -145,8 +149,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -158,7 +161,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -172,6 +175,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false
   },
   {
@@ -181,6 +185,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false
   },
   {
@@ -190,6 +195,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -214,6 +220,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       componentProps: {
         disabled: true
@@ -227,6 +234,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       value: 'Issue',
       componentProps: {
@@ -243,6 +251,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -273,8 +282,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'useOnTheWayLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -293,7 +301,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -315,7 +323,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isForm:false,
-    isTable: true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -336,7 +344,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isForm:false,
-    isTable: true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -383,6 +391,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -400,6 +409,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -413,6 +423,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -430,6 +441,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -441,7 +453,25 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 200,
       fixed: 'right'
     },
-  }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
 ]))
 
 export const IssueRequestMainRules = reactive({
@@ -470,6 +500,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
@@ -517,6 +549,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
@@ -564,9 +598,11 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:4,
+    sortTableDefault:6,
     isTableForm: false,
     isForm: false,
-    isTable: false
   },
   {
     label: '器具号',
@@ -575,9 +611,11 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
-    isTable: false
+    isTable: false,
+
   },
   {
     label: '批次',
@@ -586,6 +624,9 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortTableDefault:5,
+    sortSearchDefault:3,
     isTableForm: false,
     isForm: false
   },
@@ -602,6 +643,17 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    hiddenInMain:true,
+    sortSearchDefault:6,
+  },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -609,6 +661,10 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    isTable:false,
+    sortSearchDefault:6,
+    sortTableDefault:1100,
     isTableForm: false,
     isForm: false
   },
@@ -619,6 +675,9 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
+    sortSearchDefault:2,
+    sortTableDefault:3,
     tableForm:{
       isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
@@ -650,66 +709,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    }
-  },
+  
+  
   {
     label: '计量单位',
     field: 'uom',
@@ -720,6 +721,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
     tableForm:{
       type: 'Select',
       disabled: true
@@ -731,24 +733,22 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '采购订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false
+    sortTableDefault:1,
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false
+    sortTableDefault:2,
   },
   {
     label: '单据号',
@@ -758,6 +758,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isTableForm: false,
+    hiddenInMain:true,
     form: {
       componentProps: {
         disabled: true
@@ -771,6 +772,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -791,6 +793,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -801,6 +804,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -823,6 +827,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable:false,
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
@@ -833,6 +839,95 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 297908077..36dd09bfa 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -54,30 +54,20 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '生产计划单号',
-    field: 'productionPlanNumber',
+    label: '状态',
+    field: 'status',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm:false,
     form: {
-      labelMessage: '同时影响车间 生产线 班组 班次',
+      value: '1',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产计划', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '生产计划信息', // 查询弹窗标题
-        searchAllSchemas: ProductionMain.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionMainApi.getProductionMainPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'status',
-          value:'6',
-          isMainValue: false
-        },{
-          key:'available',
-          value:'TRUE',
-          isMainValue: false
-        }] 
+        disabled: true
       }
     }
   },
@@ -119,25 +109,6 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '班次',
-    field: 'shift',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选班次', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '班次信息', // 查询弹窗标题
-        searchAllSchemas: Shift.allSchemas, // 查询弹窗所需类
-        searchPage: ShiftApi.getShiftPage // 查询弹窗所需分页方法
-      }
-    }
-  },
   {
     label: '班组',
     field: 'team',
@@ -158,20 +129,21 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '状态',
-    field: 'status',
+    label: '班次',
+    field: 'shift',
     sort: 'custom',
     table: {
       width: 150
     },
-    dictType: DICT_TYPE.PLAN_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isForm:false,
     form: {
-      value: '1',
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选班次', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '班次信息', // 查询弹窗标题
+        searchAllSchemas: Shift.allSchemas, // 查询弹窗所需类
+        searchPage: ShiftApi.getShiftPage // 查询弹窗所需分页方法
       }
     }
   },
@@ -238,6 +210,35 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    form: {
+      labelMessage: '同时影响车间 生产线 班组 班次',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产计划', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '生产计划信息', // 查询弹窗标题
+        searchAllSchemas: ProductionMain.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionMainApi.getProductionMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'status',
+          value:'6',
+          isMainValue: false
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -253,7 +254,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -274,6 +275,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       value: 'Issue',
       componentProps: {
@@ -287,7 +289,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -308,7 +310,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -329,7 +331,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -356,6 +358,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -374,6 +377,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -383,6 +387,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -405,6 +410,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -454,6 +460,63 @@ export const PreparetoissueMainRules = reactive({
  * @returns {Array} 备料计划子表
  */
 export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工位',
+    field: 'workStation',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'prodLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'prodLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+    },
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -541,63 +604,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     },
   },
-  {
-    label: '工位',
-    field: 'workStation',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择工位', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '工位信息', // 查询弹窗标题
-        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productionLineCode',
-          value:'prodLine',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        },{
-          key:'workshopCode',
-          value:'workshop',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },{
-          key:'available',
-          value:'TRUE',
-          isMainValue: false
-        }] 
-      }
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择工位', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '工位信息', // 查询弹窗标题
-        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productionLineCode',
-          value:'prodLine',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        },{
-          key:'workshopCode',
-          value:'workshop',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },{
-          key:'available',
-          value:'TRUE',
-          isMainValue: false
-        }] 
-    },
-  },
+  
   {
     label: '截止时间',
     field: 'dueTime',
@@ -609,6 +616,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     tableForm: {
       type: 'FormDateTime',
       dateFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -631,6 +639,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       componentProps: {
         disabled: true
@@ -645,6 +654,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -657,6 +667,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -676,6 +687,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
   },
@@ -686,6 +698,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
   },
@@ -700,6 +713,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -723,6 +737,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     tableForm:{
       type: 'Select',
       default: 'TRUE'
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
index 961dcab60..590a3eeec 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -13,6 +13,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true,
   },
   {
@@ -22,7 +23,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true,
+    isTable: false,
   },
   {
     label: '车间代码',
@@ -31,6 +32,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从仓库代码',
@@ -39,6 +41,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到仓库代码',
@@ -47,6 +50,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -59,6 +63,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -79,6 +84,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -93,12 +99,12 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.JOB_STATUS,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:1,
   },
   {
     label: '过期时间',
@@ -107,6 +113,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -127,6 +134,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -143,6 +151,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   // {
   //   label: '状态',
@@ -159,6 +168,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
     }
@@ -170,6 +180,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
     }
@@ -181,6 +192,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接人',
@@ -189,6 +201,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接时间',
@@ -201,6 +214,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -217,6 +231,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '完成时间',
@@ -229,6 +244,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -243,7 +259,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -254,7 +270,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -267,6 +283,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -275,6 +292,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -287,6 +305,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -303,6 +322,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -311,6 +331,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区代码范围',
@@ -319,14 +340,14 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '使用在途库',
     field: 'useOnTheWayLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -345,7 +366,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -364,7 +385,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -383,7 +404,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -402,7 +423,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -421,7 +442,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -440,7 +461,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -459,7 +480,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -478,7 +499,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -497,7 +518,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -516,7 +537,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -572,6 +593,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '工位代码',
@@ -580,6 +603,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '在途库库位',
@@ -588,6 +613,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '包装号',
@@ -596,6 +623,26 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isSearch: true,
+    sortTableDefault:5,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
   },
   {
     label: '器具号',
@@ -604,6 +651,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable:false,
   },
   {
     label: '批次',
@@ -612,6 +661,9 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:3,
+    sortTableDefault:4,
   },
   {
     label: '库存状态',
@@ -624,6 +676,24 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -631,6 +701,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '到库位代码',
@@ -639,6 +710,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '物料代码',
@@ -647,6 +719,9 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortSearchDefault:2,
+    isSearch: true,
+    sortTableDefault:3,
   },
   {
     label: '物料名称',
@@ -655,6 +730,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
     label: '物料描述1',
@@ -663,6 +739,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '物料描述2',
@@ -671,6 +748,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '项目代码',
@@ -679,6 +757,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '数量',
@@ -689,7 +768,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain: true,
   },
   {
     label: '计量单位',
@@ -701,6 +781,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:6,
   },
   {
     label: '单据号',
@@ -709,6 +790,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    hiddenInMain: true,
   },
   {
     label: '备注',
@@ -717,6 +799,25 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -729,6 +830,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -745,23 +847,9 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
 ]))
 
 //表单校验
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index b1799c14d..5cdc61cf4 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -13,8 +13,21 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '发料记录单号',
     field: 'issueRecordNumber',
@@ -22,7 +35,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '任务单号',
@@ -31,7 +44,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '车间代码',
@@ -40,6 +53,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -48,6 +62,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '入库事务类型',
@@ -56,6 +71,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '执行时间',
@@ -68,6 +84,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -84,6 +101,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     detai: {
       dateFormat: 'YYYY-MM-DD'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -109,6 +127,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -129,6 +148,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -145,13 +165,14 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -164,6 +185,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -172,6 +194,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -180,6 +203,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -192,6 +216,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -208,26 +233,31 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -235,13 +265,14 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -254,13 +285,14 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '使用在途库',
-    field: 'useOnTheWayLocation',
+    label: '是否可用',
+    field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -275,12 +307,11 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '是否可用',
-    field: 'available',
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -293,7 +324,25 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
         activeValue: 'TRUE'
       }
     }
-  }
+  },
+  {
+    label: '包装号',   //  子表数据 只是为了展示
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '批次',     //  子表数据 只是为了展示
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
 ]))
 
 //表单校验
@@ -353,44 +402,54 @@ export const ProductionreceiptRecordMainRules = reactive({
  */
 export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
-    field: 'productionLineCode',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '工位代码',
-    field: 'workStationCode',
+    label: '到包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
-    label: '从包装号',
-    field: 'fromPackingNumber',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:9,
   },
   {
     label: '从批次',
@@ -399,6 +458,9 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    sortSearchDefault:3,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '到批次',
@@ -407,6 +469,9 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    sortSearchDefault:4,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '库存状态',
@@ -419,6 +484,33 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
   },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -426,6 +518,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '从库位组代码',
@@ -434,6 +527,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '从库区代码',
@@ -442,6 +536,16 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
   },
   {
     label: '到库位代码',
@@ -450,6 +554,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '到库位组代码',
@@ -458,6 +563,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库区代码',
@@ -466,6 +572,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -474,6 +581,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -482,6 +590,19 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:2,
+    sortTableDefault:4,
+  },
+  
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
   },
   {
     label: '备注',
@@ -490,6 +611,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -502,6 +624,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -518,16 +641,8 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -535,6 +650,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
 
   {
@@ -544,6 +660,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -552,6 +669,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -560,21 +678,11 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -585,15 +693,8 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '从器具号',
     field: 'fromContainerNumber',
@@ -601,6 +702,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到器具号',
@@ -609,23 +711,51 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '生产线代码',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
+
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    hiddenInMain:true,
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
   },
+  
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  
+  
+  
 ]))
 
 //表单校验
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 81d9c430d..07e268b41 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -13,6 +13,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true,
   },
   {
@@ -22,19 +23,25 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true,
+    isTable: false,
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false
   },
   {
     label: '申请时间',
@@ -47,6 +54,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -67,6 +75,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -95,6 +104,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -104,6 +114,19 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '优先级',
     field: 'priority',
@@ -111,10 +134,10 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
     },
-    isTable:false
   },
   {
     label: '优先级增量',
@@ -123,35 +146,58 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
     },
-    isTable:false
   },
   {
-    label: '业务类型',
-    field: 'businessType',
+    label: '部门',
+    field: 'departmentCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false
+    isTable: false,
   },
   {
     label: '到仓库代码',
@@ -167,7 +213,6 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isSearch: true,
     isTable: false,
     sort: 'custom',
     table: {
@@ -393,14 +438,6 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '承接人用户名',
     field: 'acceptUserId',
@@ -408,26 +445,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-  },
-  {
-    label: '承接时间',
-    field: 'acceptTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
+    isTable: false,
   },
   {
     label: '完成人用户名',
@@ -436,6 +454,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '完成时间',
@@ -448,6 +467,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -464,6 +484,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '来源库位',
@@ -472,6 +493,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '目标库位',
@@ -480,6 +502,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '数量',
@@ -488,6 +511,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '单位',
@@ -499,6 +523,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -507,6 +532,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+
   },
   {
     label: '创建时间',
@@ -519,6 +546,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -535,6 +563,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+
   },
   {
     label: '最后更新时间',
@@ -547,6 +577,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -634,6 +665,26 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortTableDefault:5,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
   },
   {
     label: '器具号',
@@ -642,6 +693,8 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable:false,
   },
   {
     label: '批次',
@@ -650,6 +703,8 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortSearchDefault:3,
+    sortTableDefault:4,
   },
   {
     label: '库存状态',
@@ -662,6 +717,24 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -669,6 +742,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '到库位代码',
@@ -677,6 +751,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '物料代码',
@@ -685,6 +760,9 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortSearchDefault:2,
+    isSearch: true,
+    sortTableDefault:3,
   },
   {
     label: '物料名称',
@@ -693,6 +771,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
     label: '物料描述1',
@@ -701,6 +780,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '物料描述2',
@@ -709,6 +789,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '项目代码',
@@ -717,6 +798,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '数量',
@@ -727,7 +809,8 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain: true,
   },
   {
     label: '计量单位',
@@ -739,6 +822,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:6,
   },
   {
     label: '单据号',
@@ -747,6 +831,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
   },
   {
     label: '备注',
@@ -755,6 +840,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '从货主代码',
@@ -763,6 +849,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '到货主代码',
@@ -771,6 +858,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -783,6 +871,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -799,6 +888,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
 ]))
 
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
index 3de9f2a92..95b6c3299 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -13,8 +13,21 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -22,7 +35,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '任务单号',
@@ -31,7 +44,16 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -40,6 +62,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '入库事务类型',
@@ -48,6 +71,8 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+
   },
   {
     label: '执行时间',
@@ -60,6 +85,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -76,6 +102,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -101,6 +128,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -121,6 +149,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -137,13 +166,14 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -156,6 +186,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -164,6 +195,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -172,6 +204,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -184,6 +217,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -208,6 +242,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -216,13 +251,14 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -235,13 +271,14 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -254,14 +291,14 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '是否可用',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -275,6 +312,24 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '包装号',   //  子表数据 只是为了展示
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '批次',     //  子表数据 只是为了展示
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
 ]))
 
 //表单校验
@@ -340,6 +395,8 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '到包装号',
@@ -348,6 +405,38 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
   },
   {
     label: '从批次',
@@ -356,6 +445,9 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortSearchDefault:3,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '到批次',
@@ -364,6 +456,9 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortSearchDefault:4,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '库存状态',
@@ -376,6 +471,24 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+  },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -383,6 +496,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '从库位代码',
@@ -391,6 +505,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '从库位组代码',
@@ -399,6 +514,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '从库区代码',
@@ -407,6 +523,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到货主代码',
@@ -415,6 +532,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库位代码',
@@ -423,6 +541,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '到库位组代码',
@@ -431,6 +550,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库区代码',
@@ -439,6 +559,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -447,6 +568,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -455,6 +577,18 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:2,
+    sortTableDefault:4,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
   },
   {
     label: '备注',
@@ -463,6 +597,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -475,6 +610,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -491,14 +627,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    hiddenInMain:true,
   },
   {
     label: '物料描述1',
@@ -507,6 +636,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述2',
@@ -515,6 +645,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -523,6 +654,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -531,29 +663,19 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '代码',
-    field: 'code',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -564,6 +686,8 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
   // {
   //   label: '任务明细ID',
@@ -580,6 +704,8 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
   {
     label: '到器具号',
@@ -588,6 +714,8 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
 ]))
 
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index c27fc759c..b3ab53b53 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -45,16 +45,17 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortSearchDefault:1,
   },
   {
     label: '状态',
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
     isForm:false,
     isTable: true,
     sort: 'custom',
+    sortTableDefault:1,
     table: {
       width: 150
     },
@@ -70,12 +71,11 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
     },
-    isSearch: true,
     isForm: false,
   },
   {
@@ -83,7 +83,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -97,6 +97,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -106,6 +107,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -119,6 +121,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -141,6 +144,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -159,6 +163,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -182,6 +187,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       value: 'Repleinment',
       componentProps: {
@@ -206,6 +212,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -230,6 +237,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       componentProps: {
         disabled: true
@@ -241,7 +249,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -263,7 +271,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isForm:false,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -284,7 +292,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isForm:false,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -330,6 +338,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -347,6 +356,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -360,6 +370,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -378,6 +390,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isForm: false,
   },
   {
@@ -389,7 +403,25 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 300,
       fixed: 'right'
     },
-  }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
 ]))
 
 //表单校验
@@ -440,6 +472,10 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    sortSearchDefault:1000,
+    isSearch: true,
+    sortTableDefault:1100,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -470,6 +506,61 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
   },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+    sortTableDefault:6,
+    sortSearchDefault:4,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    sortTableDefault:5,
+    sortSearchDefault:3,
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    form: {
+      value: 'OK',
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      default: 'OK',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
   {
     label: '单据号',
     field: 'number',
@@ -477,6 +568,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -491,6 +583,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
+    sortSearchDefault:2,
+    sortTableDefault:3,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -528,6 +623,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -540,6 +636,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -559,6 +656,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -569,6 +667,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:4,
     isTableForm: false,
     isForm: false,
   },
@@ -579,6 +678,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
@@ -589,6 +689,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
@@ -599,6 +700,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
@@ -609,6 +711,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -632,6 +735,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
     tableForm: {
       type: 'Select',
       disabled: true
@@ -643,27 +747,24 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '采购订单号',
+    field: 'poNumber',
     sort: 'custom',
-    form: {
-      value: 'OK',
-      componentProps: {
-        disabled: true
-      }
+    table: {
+      width: 150
     },
+    sortTableDefault:1,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      type: 'Select',
-      default: 'OK',
-      disabled: true
-    }
+    sortTableDefault:2,
   },
+  
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -673,6 +774,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    hiddenInMain:true,
   },
   {
     label: '到货主代码',
@@ -683,6 +785,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    hiddenInMain:true,
   },
   {
     label: '最后更新时间',
@@ -695,6 +798,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -704,6 +808,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -715,6 +820,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTableForm: false,
+    hiddenInMain:true,
     isForm: false
   },
   {
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index d74df140c..d690db283 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -443,6 +443,9 @@ export const ProductdismantleRequestMainRules = reactive({
   team: [
     { required: true, message: '请选择班组', trigger: 'change' }
   ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
   shift: [
     { required: true, message: '请选择班次', trigger: 'change' }
   ],
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index 91583491c..7133a4331 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -358,6 +358,7 @@ const handleDeleteTable = (item, index) => {
 
 // 主子数据 提交
 const submitForm = async (formType, data) => {
+  data.type = 'predict'
   data.subList = tableData.value // 拼接子表数据参数
   if(data.subList.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
index 8b9f68017..ea0170c8b 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
@@ -62,7 +62,7 @@
     :detailAllSchemas="ProductputawayJobDetail.allSchemas"
     :detailAllSchemasRules="ProductputawayJobDetailRules"
     :searchTableParams="searchTableParams"
-    :apiPage="ProductputawayJobDetailApi.getProductputawayJobDetailPage"
+    :apiPage="ProductputawayJobDetailApi.getProductputawayJobDetailPageAssemble"
   />
 </template>
 
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
index 6d4c8b645..3061645f5 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
@@ -57,7 +57,7 @@
     :allSchemas="ProductputawayRecordMain.allSchemas"
     :detailAllSchemas="ProductputawayRecordDetail.allSchemas"
     :detailAllSchemasRules="ProductputawayRecordDetailRules"
-    :apiPage="ProductputawayRecordDetailApi.getProductputawayRecordDetailPage"
+    :apiPage="ProductputawayRecordDetailApi.getProductputawayRecordDetailPageAssemble"
   />
 </template>
 
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index 8393c6b5c..5a5726392 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -66,7 +66,7 @@
     :detailAllSchemasRules="ProductputawayRequestDetailRules"
     :apiCreate="ProductputawayRequestDetailApi.createProductputawayRequestDetail"
     :apiUpdate="ProductputawayRequestDetailApi.updateProductputawayRequestDetail"
-    :apiPage="ProductputawayRequestDetailApi.getProductputawayRequestDetailPage"
+    :apiPage="ProductputawayRequestDetailApi.getProductputawayRequestDetailPageAssemble"
     :apiDelete="ProductputawayRequestDetailApi.deleteProductputawayRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
@@ -358,7 +358,7 @@ const handleDeleteTable = (item, index) => {
 
 // 主子数据 提交
 const submitForm = async (formType, data) => {
-    data.type = 'assemble'
+  data.type = 'assemble'
   data.subList = tableData.value // 拼接子表数据参数
   if(data.subList.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index abe333bba..595e7845e 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -727,6 +727,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '操作',
     field: 'action',
+    hiddenInMain:true,
     isDetail: false,
     isForm: false ,
     table: {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index fabd59e4a..b85e7a8fa 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -25,8 +25,12 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '生产线代码',
-    field: 'productionPlanNumber',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -40,10 +44,20 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '生产线代码',
+    field: 'productionPlanNumber',
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '班组',
     field: 'team',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -52,6 +66,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '班次',
     field: 'shift',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -62,6 +77,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
     dictClass: 'string',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -71,6 +87,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -83,6 +100,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -98,6 +116,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '要求截止时间',
     field: 'requestDueTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -115,21 +134,11 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '过期时间',
     field: 'expiredTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -150,6 +159,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '最后更新时间',
     field: 'updateTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -170,23 +180,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '最后更新者',
     field: 'updater',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
     },
   },
-  // {
-  //   label: '状态',
-  //   field: 'jobStageStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '优先级',
     field: 'priority',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -198,6 +202,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '优先级增量',
     field: 'priorityIncrement',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -209,6 +214,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -216,6 +222,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接人',
     field: 'acceptUserId',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -224,6 +231,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接时间',
     field: 'acceptTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -244,6 +252,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '完成人',
     field: 'completeUserId',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -252,6 +261,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '完成时间',
     field: 'completeTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -272,9 +282,9 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
+    isTable:false,
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -285,7 +295,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -294,6 +304,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '业务类型',
     field: 'businessType',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -302,6 +313,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -310,6 +322,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -330,6 +343,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -338,6 +352,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -348,7 +363,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -367,7 +382,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -386,7 +401,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -405,7 +420,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -424,7 +439,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -443,7 +458,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -462,7 +477,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -481,7 +496,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -500,7 +515,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -519,7 +534,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -628,6 +643,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装号',
     field: 'packingNumber',
+    sortTableDefault:1003,
     sort: 'custom',
     table: {
       width: 150
@@ -636,6 +652,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '器具号',
     field: 'containerNumber',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -644,6 +662,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '批次',
     field: 'batch',
+    sortTableDefault:1002,
     sort: 'custom',
     table: {
       width: 150
@@ -652,6 +671,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
+    sortTableDefault:1008,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -673,6 +693,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
+    hiddenInMain:true,
+    isTable:false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -694,6 +716,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    sortTableDefault:1007,
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
@@ -705,6 +728,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库位代码',
     field: 'toLocationCode',
+    sortTableDefault:1009,
     sort: 'custom',
     table: {
       width: 150
@@ -712,6 +736,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '订单号',
+    hiddenInMain:true,
+    isTable:false,
     field: 'woNumber',
     sort: 'custom',
     table: {
@@ -721,6 +747,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单行',
     field: 'woLine',
+    hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -729,6 +757,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装数量',
     field: 'packQty',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -740,6 +770,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
+    sortTableDefault:1004,
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
     isTable: true,
@@ -751,6 +782,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料代码',
     field: 'itemCode',
+    sortTableDefault:1000,
     sort: 'custom',
     table: {
       width: 150
@@ -759,6 +791,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料名称',
     field: 'itemName',
+    sortTableDefault:1001,
     sort: 'custom',
     table: {
       width: 150
@@ -767,6 +800,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述1',
     field: 'itemDesc1',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -775,6 +810,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述2',
     field: 'itemDesc2',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -783,6 +820,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目代码',
     field: 'projectCode',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -792,6 +831,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    sortTableDefault:1005,
     table: {
       width: 150
     },
@@ -803,6 +843,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计量单位',
     field: 'uom',
     dictType: DICT_TYPE.UOM,
+    sortTableDefault:1006,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -813,6 +854,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 180
@@ -821,6 +864,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -829,6 +874,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    sortTableDefault:1011,
     sort: 'custom',
     table: {
       width: 150
@@ -837,6 +883,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1010,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -857,6 +904,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货主代码',
     field: 'toOwnerCode',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index 2e0f56b99..e8f8bc2ea 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -25,8 +25,12 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '生产线代码',
-    field: 'productionPlanNumber',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -35,6 +39,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '车间代码',
     field: 'workshopCode',
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionPlanNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -44,6 +57,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '班组',
     field: 'team',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -52,6 +66,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '班次',
     field: 'shift',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -62,6 +77,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
     dictClass: 'string',
+    isTable:false,
     table: {
       width: 150
     },
@@ -74,6 +90,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -86,6 +103,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -101,6 +119,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '要求截止时间',
     field: 'requestDueTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -118,21 +137,10 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '过期时间',
     field: 'expiredTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -153,6 +161,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '最后更新时间',
     field: 'updateTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -173,23 +182,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '最后更新者',
     field: 'updater',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
     },
   },
-  // {
-  //   label: '状态',
-  //   field: 'jobStageStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '优先级',
     field: 'priority',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -201,6 +204,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '优先级增量',
     field: 'priorityIncrement',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -212,6 +216,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -219,6 +224,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接人',
     field: 'acceptUserId',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -227,6 +233,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接时间',
     field: 'acceptTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -247,6 +254,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '完成人',
     field: 'completeUserId',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -255,6 +263,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '完成时间',
     field: 'completeTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -275,9 +284,9 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
+    isTable:false,
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -288,7 +297,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -297,6 +306,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '业务类型',
     field: 'businessType',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -305,6 +315,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -313,6 +324,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -333,6 +345,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -341,6 +354,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -351,7 +365,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -370,7 +384,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -389,7 +403,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -408,7 +422,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -427,7 +441,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -446,7 +460,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -465,7 +479,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -484,7 +498,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -503,7 +517,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -522,7 +536,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -631,6 +645,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装号',
     field: 'packingNumber',
+    sortTableDefault:1003,
     sort: 'custom',
     table: {
       width: 150
@@ -639,6 +654,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '器具号',
     field: 'containerNumber',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -647,6 +664,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '批次',
     field: 'batch',
+    sortTableDefault:1002,
     sort: 'custom',
     table: {
       width: 150
@@ -655,6 +673,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
+    sortTableDefault:1008,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -676,6 +695,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
+    hiddenInMain:true,
+    isTable:false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -697,6 +718,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    sortTableDefault:1007,
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
@@ -708,6 +730,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库位代码',
     field: 'toLocationCode',
+    sortTableDefault:1009,
     sort: 'custom',
     table: {
       width: 150
@@ -716,6 +739,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单号',
     field: 'woNumber',
+    hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -724,6 +749,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单行',
     field: 'woLine',
+    hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -732,6 +759,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装数量',
     field: 'packQty',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -743,6 +772,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
+    sortTableDefault:1004,
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
     isTable: true,
@@ -754,6 +784,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料代码',
     field: 'itemCode',
+    sortTableDefault:1000,
     sort: 'custom',
     table: {
       width: 150
@@ -762,6 +793,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料名称',
     field: 'itemName',
+    sortTableDefault:1001,
     sort: 'custom',
     table: {
       width: 150
@@ -770,6 +802,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述1',
     field: 'itemDesc1',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -778,6 +812,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述2',
     field: 'itemDesc2',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -786,6 +822,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目代码',
     field: 'projectCode',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -795,6 +833,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    sortTableDefault:1005,
     table: {
       width: 150
     },
@@ -806,6 +845,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计量单位',
     field: 'uom',
     dictType: DICT_TYPE.UOM,
+    sortTableDefault:1006,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -816,6 +856,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 180
@@ -824,6 +866,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -832,6 +876,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    sortTableDefault:1011,
     sort: 'custom',
     table: {
       width: 150
@@ -840,6 +885,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1010,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -860,6 +906,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货主代码',
     field: 'toOwnerCode',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
index d88c730ec..8e9809929 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
@@ -25,8 +25,12 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '生产线代码',
-    field: 'productionPlanNumber',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -40,10 +44,20 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '生产线代码',
+    field: 'productionPlanNumber',
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '班组',
     field: 'team',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -52,6 +66,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '班次',
     field: 'shift',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -60,6 +75,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -67,6 +83,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '申请时间',
     field: 'requestTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -87,6 +104,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '要求截止时间',
     field: 'requestDueTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -104,21 +122,10 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '过期时间',
     field: 'expiredTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -139,6 +146,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '最后更新时间',
     field: 'updateTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -160,6 +168,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -176,6 +185,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '优先级',
     field: 'priority',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -186,6 +196,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '优先级增量',
     field: 'priorityIncrement',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -198,6 +209,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -205,6 +217,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接人',
     field: 'acceptUserId',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -213,6 +226,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接时间',
     field: 'acceptTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -233,6 +247,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '完成人',
     field: 'completeUserId',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -241,6 +256,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '完成时间',
     field: 'completeTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -261,9 +277,9 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
+    isTable:false,
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -274,7 +290,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -283,6 +299,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '业务类型',
     field: 'businessType',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -291,6 +308,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -299,6 +317,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -319,6 +338,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -327,6 +347,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -337,7 +358,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -356,7 +377,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -375,7 +396,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -394,7 +415,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -413,7 +434,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -432,7 +453,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -451,7 +472,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -470,7 +491,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -489,7 +510,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -508,7 +529,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -617,6 +638,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装号',
     field: 'packingNumber',
+    sortTableDefault:1003,
     sort: 'custom',
     table: {
       width: 150
@@ -625,6 +647,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '器具号',
     field: 'containerNumber',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -633,6 +657,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '批次',
     field: 'batch',
+    sortTableDefault:1002,
     sort: 'custom',
     table: {
       width: 150
@@ -641,6 +666,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
+    sortTableDefault:1008,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -662,6 +688,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
+    hiddenInMain:true,
+    isTable:false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -683,6 +711,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    sortTableDefault:1007,
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
@@ -694,6 +723,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库位代码',
     field: 'toLocationCode',
+    sortTableDefault:1009,
     sort: 'custom',
     table: {
       width: 150
@@ -702,6 +732,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单号',
     field: 'woNumber',
+    hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -710,6 +742,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单行',
     field: 'woLine',
+    hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -718,6 +752,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装数量',
     field: 'packQty',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -729,6 +765,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
+    sortTableDefault:1004,
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
     isTable: true,
@@ -740,6 +777,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料代码',
     field: 'itemCode',
+    sortTableDefault:1000,
     sort: 'custom',
     table: {
       width: 150
@@ -748,6 +786,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料名称',
     field: 'itemName',
+    sortTableDefault:1001,
     sort: 'custom',
     table: {
       width: 150
@@ -756,6 +795,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述1',
     field: 'itemDesc1',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -764,6 +805,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述2',
     field: 'itemDesc2',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -772,6 +815,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目代码',
     field: 'projectCode',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -781,6 +826,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    sortTableDefault:1005,
     table: {
       width: 150
     },
@@ -792,6 +838,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计量单位',
     field: 'uom',
     dictType: DICT_TYPE.UOM,
+    sortTableDefault:1006,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -803,6 +850,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    isTable:false,
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -810,6 +859,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -818,6 +869,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    sortTableDefault:1011,
     sort: 'custom',
     table: {
       width: 150
@@ -826,6 +878,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1010,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -847,6 +900,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
+    isTable:false,
+    hiddenInMain:true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index a7e639626..7d62e760c 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -67,6 +67,25 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isSearch: true,
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '生产计划单号',
     field: 'productionPlanNumber',
@@ -76,6 +95,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     isForm: false,
+    isTable:false,
   },
   {
     label: '车间代码',
@@ -109,6 +129,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -133,6 +154,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 1001,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -150,6 +172,24 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'scrap',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -157,6 +197,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -164,11 +205,11 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -178,6 +219,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -193,6 +235,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -224,6 +267,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -233,6 +277,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -255,6 +300,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -277,6 +323,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '部门',
@@ -300,27 +347,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           valueField: 'id'
         }
       }
-    }
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTable: false,
   },
+  
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -341,7 +371,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -350,14 +381,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '自动提交',
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -378,7 +410,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -399,7 +431,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -436,22 +468,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '收货类型',
-    field: 'type',
-    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'scrap',
-      componentProps: {
-        disabled: true
-      }
-    },
-  },
   {
     label: '操作',
     field: 'action',
@@ -475,9 +491,9 @@ export const ProductreceiptRequestMainRules = reactive({
   shift: [
     { required: true, message: '请选择班次代码', trigger: 'change' }
   ],
-  // departmentCode: [
-  //   { required: true, message: '请输入部门', trigger: 'blur' }
-  // ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'blur' }
+  ],
   autoCommit: [
     { required: true, message: '请选择是否自动提交', trigger: 'change' }
   ],
@@ -637,6 +653,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable:false,
     isTableForm: false,
     isForm: false
   },
@@ -647,6 +665,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable:false,
     isTableForm: false,
     isForm: false
   },
@@ -655,8 +675,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'inventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -670,6 +691,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -680,6 +703,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -690,6 +715,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -705,8 +732,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'packUnit',
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -717,6 +745,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
+    isTable: false,
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -730,6 +760,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
+    hiddenInMain:true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -744,6 +776,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1003,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码',
@@ -791,6 +824,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1004,
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
@@ -835,6 +869,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '批次',
     field: 'batch',
     sort: 'custom',
+    sortTableDefault:1006,
     table: {
       width: 150
     },
@@ -856,6 +891,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -866,6 +903,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -876,6 +915,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -883,6 +924,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    sortTableDefault:1006,
     table: {
       width: 150
     },
@@ -904,6 +946,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    sortTableDefault:1007,
     isTable: true,
     sort: 'custom',
     table: {
@@ -921,6 +964,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
+    sortTableDefault:1008,
     sort: 'custom',
     table: {
       width: 180
@@ -942,6 +986,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '过期日期',
     field: 'expireDate',
+    hiddenInMain:true,
+    isTable: false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -967,6 +1013,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '备注',
     field: 'remark',
+    isTable: false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -975,6 +1023,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1009,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -998,6 +1047,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '创建者',
     field: 'creator',
+    sortTableDefault:1010,
     sort: 'custom',
     table: {
       width: 150
@@ -1008,6 +1058,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '最后更新时间',
     field: 'updateTime',
+    isTable: false,
+    hiddenInMain:true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -1031,6 +1083,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '最后更新者',
     field: 'updater',
+    isTable: false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -1041,6 +1095,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '操作',
     field: 'action',
+    hiddenInMain:true,
     isDetail: false,
     isForm: false ,
     table: {
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index f856e1a44..9629bcc5a 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -55,6 +55,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -77,6 +78,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -99,6 +101,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -151,6 +154,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
+
   },
   {
     label: '承接时间',
@@ -163,6 +168,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -191,6 +197,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
+
   },
   {
     label: '完成时间',
@@ -203,6 +211,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -367,6 +376,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -380,6 +390,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -398,6 +409,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -411,6 +423,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -429,6 +442,39 @@ export const ProductredressJobDetailRules = reactive({
 })
 
 export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '回收数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '包装号',
     field: 'packingNumber',
@@ -438,8 +484,44 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -489,22 +571,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   //   isForm: false
   // },
-  {
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物品名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '物品描述1',
     field: 'itemDesc1',
@@ -512,6 +579,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '物品描述2',
@@ -520,6 +589,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -528,40 +599,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    isTable:false,
+    hiddenInMain:true,
   },
   // {
   //   label: '单据号',
@@ -571,24 +610,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '订单号',
     field: 'woNumber',
@@ -596,6 +618,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '订单行',
@@ -604,6 +628,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '备注',
@@ -612,6 +638,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '创建者',
@@ -620,6 +648,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -632,6 +662,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -651,6 +683,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '最后更新时间',
@@ -663,6 +697,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index 7ad1d9b66..af0629dc4 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -43,6 +43,18 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
     },
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isForm:false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
   // {
   //   label: '生产计划单号',
   //   field: 'productionPlanNumber',
@@ -93,6 +105,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -115,6 +128,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -144,6 +158,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -166,6 +181,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -255,6 +271,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     isForm: false,
+    isTable:false,
     table: {
       width: 150
     },
@@ -270,6 +287,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -289,6 +307,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '最后更新时间',
@@ -301,6 +320,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -323,13 +343,20 @@ export const ProductredressRecordDetailRules = reactive({
 
 export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
     },
-    isForm: false,
   },
   {
     label: '批次',
@@ -341,62 +368,117 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '回收数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
     }
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '到库区代码',
+    field: 'toAreaCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
+  
+  
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
   {
     label: '生产日期',
@@ -418,6 +500,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    isTable:false,
+    hiddenInMain: true,
     isForm: false
   },
   {
@@ -431,6 +515,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -442,64 +528,20 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: false
   },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
+  
+  
   {
     label: 'BOM版本',
     field: 'bomVersion',
     sort: 'custom',
     table: {
       width: 150
-    }
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    sort: 'custom',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '到库区代码',
-    field: 'toAreaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
+    },
+    isTable:false,
+    hiddenInMain: true,
   },
+  
+  
   // {
   //   label: '到货主代码',
   //   field: 'toOwnerCode',
@@ -514,7 +556,9 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sort: 'custom',
     table: {
       width: 150
-    }
+    },
+    isTable:false,
+    hiddenInMain: true,
   },
   {
     label: '创建者',
@@ -524,6 +568,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -545,7 +591,9 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: false,
+    isTable:false,
+    hiddenInMain: true,
   },
   {
     label: '最后更新者',
@@ -555,6 +603,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true,
   },
   {
     label: '最后更新时间',
@@ -576,6 +626,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: false,
+    isTable:false,
+    hiddenInMain: true,
   }
 ]))
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index b06172a41..b70dabe87 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -75,6 +75,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -97,6 +98,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -172,7 +174,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
   },
   {
-    label: '备注',
+    label: '原因',
     field: 'remark',
     sort: 'custom',
     isTable:false,
@@ -216,6 +218,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     isForm: false,
+    isTable: false,
     table: {
       width: 150
     },
@@ -231,6 +234,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -250,6 +254,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '最后更新时间',
@@ -262,6 +267,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -294,16 +300,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   field: 'bomVersion',
   //   sort: 'custom',
   // },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isForm: false,
-    isTableForm: false,
-  },
+  
   {
     label: '物料代码',
     field: 'itemCode',
@@ -374,6 +371,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isForm: false,
     isTableForm: false,
+    hiddenInMain:true,
   },
   {
     label: '物品描述2',
@@ -384,21 +382,13 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isForm: false,
     isTableForm: false,
+    hiddenInMain:true,
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '数量',
-    field: 'qty',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
@@ -412,10 +402,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+    label: '回收数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -430,8 +418,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '库位',
-    field: 'toLocationCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -446,8 +434,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
@@ -462,10 +450,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
@@ -479,8 +466,10 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
@@ -495,8 +484,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
+    label: '库存状态',
+    field: 'inventoryStatus',
     sort: 'custom',
     table: {
       width: 150
@@ -511,8 +500,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
+    label: '库位',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -526,6 +515,29 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    hiddenInMain:true,
+
+  },{
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    isTableForm: false,
+    hiddenInMain:true,
+  },
+  
   {
     label: '备注',
     field: 'remark',
@@ -533,6 +545,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true
   },
   {
     label: '创建者',
@@ -543,6 +557,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTableForm: false,
     isForm: false,
+    isTable:false,
+    hiddenInMain:true
   },
   {
     label: '创建时间',
@@ -555,6 +571,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -574,6 +592,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
     isForm: false,
     isTableForm: false,
   },
@@ -588,6 +608,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -600,11 +622,13 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
+  
   {
     label: '操作',
     field: 'action',
     isForm: false,
     isTableForm: false,
+    hiddenInMain:true,
     table: {
       width: 150,
       fixed: 'right'
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index 19d07630a..ad8395324 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -15,6 +15,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortTableDefault:1,
     isSearch: true
   },
   {
@@ -23,15 +24,18 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 180
-    }
+    },
+    sortTableDefault:2,
   },
   {
-    label: '车间代码',
+    label: '车间',
     field: 'workshopCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
+
   },
   {
     label: '班组',
@@ -40,6 +44,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '班次',
@@ -48,6 +53,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '出库事务类型',
@@ -56,6 +62,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '入库事务类型',
@@ -64,6 +71,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '执行时间',
@@ -76,6 +84,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -96,6 +105,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -117,6 +127,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -137,6 +148,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -153,13 +165,14 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -173,6 +186,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '备注',
@@ -181,6 +195,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '创建者',
@@ -189,6 +204,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '创建时间',
@@ -201,6 +217,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -225,13 +242,14 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -241,6 +259,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -251,7 +270,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -328,62 +347,70 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
       show:false
     },
+    hiddenInMain:true,
   },
   {
-    label: '生产线代码',
+    label: '返修生产线',
     field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:4,
   },
   {
-    label: '工位代码',
+    label: '返修工位',
     field: 'workStationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:5,
   },
   {
-    label: '工序代码',
+    label: '工序',
     field: 'processCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:6,
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:11,
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:11,
   },
   {
-    label: '成品库位代码',
-    field: 'fgFromLocationCode',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
-    }
+    },
+    hiddenInMain:true,
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '成品库位',
+    field: 'fgFromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:19,
   },
   {
     label: '生产日期',
@@ -396,6 +423,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -417,6 +445,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -433,6 +462,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -445,6 +475,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库位组代码',
@@ -453,6 +484,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库区代码',
@@ -461,6 +493,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -469,6 +502,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -477,6 +511,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
     label: '备注',
@@ -485,6 +520,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -497,6 +533,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -513,6 +550,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料名称',
@@ -521,6 +559,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
   },
   {
     label: '物料描述1',
@@ -529,6 +568,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述2',
@@ -537,6 +577,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -545,6 +586,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -553,6 +595,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:12,
     form: {
       component: 'InputNumber',
     }
@@ -563,10 +606,20 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
+    sortTableDefault:13,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'Bom来源库位',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:18,
   },
   // {
   //   label: '任务明细ID',
@@ -594,6 +647,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: 'Bom版本',
@@ -602,6 +656,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:10,
     tableForm: {
       disabled: true,
       isInpuFocusShow: true,
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index b95fd4b00..ae8d0a998 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -232,7 +232,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      if(formField == 'packingNumber'){
+      if(formField == 'itemCode'){
         row['containerNumber'] = val[0]['containerNumber']
         row['itemCode'] = val[0]['itemCode']
         row['packingNumber'] = val[0]['packingNumber']
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 8128a5378..fc3fb00f5 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -60,14 +60,36 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortTableDefault:1,
   },
   {
-    label: '车间代码',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '车间',
     field: 'workshopCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
     isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -86,6 +108,54 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '返修生产线',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
   {
     label: '班组',
     field: 'team',
@@ -93,6 +163,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:8,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -117,6 +188,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -141,6 +213,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -148,7 +221,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -162,6 +235,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -177,6 +251,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -199,6 +274,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -217,6 +293,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -230,6 +307,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -252,6 +330,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -270,6 +349,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -286,25 +366,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -316,6 +378,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -334,6 +397,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -341,7 +405,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -362,7 +426,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -383,7 +447,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -472,63 +536,19 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 150,
       show: false
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
   },
+  
   {
-    label: '返修生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'workshopCode',
-        value: 'workshopCode',
-        message: '请填写车间代码！',
-        isMainValue: true
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '生产线信息', // 查询弹窗标题
-        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'workshopCode',
-          value: 'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        }]
-      }
-    }
-  },
-  {
-    label: '返修工位代码',
+    label: '返修工位',
     field: 'workStationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:5,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
@@ -574,8 +594,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     field: 'fromLocationCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 160
     },
+    sortTableDefault:18,
     tableForm: {
       disabled: true
     },
@@ -586,12 +607,13 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '工序代码',
+    label: '工序',
     field: 'processCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:7,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工序代码',
@@ -629,8 +651,15 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    sortTableDefault:10,
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalanceItemPage
     },
     form: {
       componentProps:{
@@ -645,13 +674,15 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:15,
     tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalanceItemPage
+      disabled: true,
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择物料',
+      // searchField: 'packingNumber',
+      // searchTitle: '库存余额信息',
+      // searchAllSchemas: Balance.allSchemas,
+      // searchPage: BalanceApi.getBalanceItemPage
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -666,15 +697,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '成品库位代码',
+    label: '成品库位',
     field: 'fgFromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:19,
     tableForm: {
       disabled: true
     },
+    isTable: true,
     form: {
       componentProps:{
         disabled: true
@@ -688,6 +721,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     tableForm: {
       disabled: true
     },
@@ -704,6 +739,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:13,
     tableForm: {
       disabled: true
     },
@@ -728,6 +764,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true,
       type: 'Select'
     },
+    hiddenInMain:true,
+    sortTableDefault:18,
     form: {
       componentProps:{
         disabled: true
@@ -742,6 +780,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     isTableForm: false,
+    hiddenInMain: true,
+    isTable: false,
     form: {
       componentProps: {
         disabled: true
@@ -755,6 +795,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -767,6 +809,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddenInMain: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -786,6 +830,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -797,6 +843,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTableForm: false,
+    sortTableDefault:11,
     isForm: false,
   },
   {
@@ -806,6 +853,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
@@ -816,6 +865,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
@@ -826,16 +877,19 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
   {
-    label: '数量',
+    label: '返修数量',
     field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:16,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -859,6 +913,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:17,
     tableForm: {
       type: 'Select'
     }
@@ -874,6 +929,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddenInMain: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -893,6 +950,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -903,6 +962,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:12,
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
index c5b37d4fd..14699c0c1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -14,7 +14,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
     isSearch: true,
-    sortSearchDefault: 1
+    sortSearchDefault: 1,
   },
   {
     label: '申请单号',
@@ -33,6 +33,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 4,
     sortSearchDefault: 4
   },
   {
@@ -659,6 +660,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 17,
     hiddenInMain:true,
   },
   {
@@ -668,6 +670,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 17,
     hiddenInMain:true,
   },
   {
@@ -678,7 +681,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
-    sortTableDefault: 1002
+    sortTableDefault: 10,
   },
   {
     label: '包装规格',
@@ -687,7 +690,19 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault: 1002
+    sortTableDefault: 10,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 10,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '器具号',
@@ -696,6 +711,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
   },
   {
@@ -706,7 +722,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
-    sortTableDefault: 1001,
+    sortTableDefault: 9,
     sortSearchDefault: 6
   },
   {
@@ -716,38 +732,43 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault: 15,
     hiddenInMain:true,
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault: 15,
     hiddenInMain:true,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault: 15,
     hiddenInMain:true,
   },
+  
   {
     label: '订单号',
     field: 'poNumber',
@@ -755,6 +776,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 5,
   },
   {
     label: '订单行',
@@ -763,18 +785,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-  },
-  {
-    label: '原因',
-    field: 'reason',
-    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
+    sortTableDefault: 6,
   },
   {
     label: '物料代码',
@@ -784,6 +795,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    sortTableDefault: 7,
     sortSearchDefault: 5
   },
   {
@@ -793,6 +805,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 7,
   },
   {
     label: '物料描述1',
@@ -802,6 +815,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     hiddenInMain:true,
+    sortTableDefault: 8,
   },
   {
     label: '物料描述2',
@@ -811,6 +825,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     hiddenInMain:true,
+    sortTableDefault: 8,
   },
   {
     label: '项目代码',
@@ -819,6 +834,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 18,
     hiddenInMain:true,
   },
   {
@@ -831,7 +847,32 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
     },
-    sortTableDefault: 1003
+    sortTableDefault: 12,
+  },
+  {
+    label: '退货数量',
+    field: 'returnedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+        disabled:false
+      }
+    },
+    sortTableDefault: 11,
+    hiddenInMain:true,
+    isForm:false,
+    tableForm:{
+      type:'InputNumber',
+      min:0,
+      precision: 6,
+      disabled:false
+    }
   },
   {
     label: '计量单位',
@@ -843,7 +884,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault: 1003
+    sortTableDefault: 12,
   },
   {
     label: '单据号',
@@ -852,6 +893,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 20,
     hiddenInMain:true,
   },
   {
@@ -861,6 +903,31 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    sortTableDefault: 20,
+    hiddenInMain:true,
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 20,
+    hiddenInMain:true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 20,
     hiddenInMain:true,
   },
   {
@@ -874,6 +941,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 20,
     hiddenInMain:true,
     form: {
       component: 'DatePicker',
@@ -884,15 +952,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  }
+  
 ]))
 
 //表单校验
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index ab0a2016b..9b8147bd6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -13,6 +13,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortTableDefault: 1012,
     sortSearchDefault:1,
     isSearch: true
   },
@@ -331,7 +332,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
+    label: '原因',
     field: 'available',
     sort: 'custom',
     table: {
@@ -456,7 +457,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
     hiddenInMain: true,
     sortSearchDefault: 1002,
-
+    sortTableDefault: 1001,
   },
   {
     label: '包装规格',
@@ -469,6 +470,43 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     sortTableDefault: 1004,
   },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 1004,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '退货数量',
+    field: 'returnedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+        disabled:false
+      }
+    },
+    sortTableDefault: 1004,
+    hiddenInMain:true,
+    isForm:false,
+    tableForm:{
+      type:'InputNumber',
+      min:0,
+      precision: 6,
+      disabled:false
+    }
+  },
   {
     label: '从器具号',
     field: 'fromContainerNumber',
@@ -476,6 +514,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain: true
   },
   {
@@ -485,6 +524,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain: true
   },
   {
@@ -505,6 +545,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isSearch: true,
+    sortTableDefault: 1000,
     hiddenInMain: true
   },
   {
@@ -514,6 +555,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain: true
   },
   {
@@ -523,6 +565,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1009,
     hiddenInMain: true
   },
   {
@@ -532,6 +575,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1009,
     hiddenInMain: true
   },
   {
@@ -541,6 +585,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1010,
     hiddenInMain: true
   },
   {
@@ -550,6 +595,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1010,
     hiddenInMain: true
   },
   {
@@ -559,6 +605,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1010,
     hiddenInMain: true
   },
   {
@@ -568,6 +615,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1010,
     hiddenInMain: true
   },
   {
@@ -577,6 +625,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1010,
     hiddenInMain: true
   },
   {
@@ -586,6 +635,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1010,
     hiddenInMain: true
   },
   {
@@ -598,6 +648,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1008,
     hiddenInMain: true
   },
   {
@@ -607,6 +658,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 4,
   },
   {
     label: '订单行',
@@ -615,44 +667,33 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 5,
   },
   {
-    label: '原因',
-    field: 'reason',
-    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true
-  },
-  {
-    label: '单价',
-    field: 'singlePrice',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
+      width: 180,
     },
-    hiddenInMain: true
+    sortTableDefault: 1013,
+    hiddenInMain: true,
+    isSearch: true
   },
   {
-    label: '金额',
-    field: 'amount',
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    },
+    sortTableDefault: 1013,
     hiddenInMain: true
-
   },
+  
   {
     label: '物料代码',
     field: 'itemCode',
@@ -670,6 +711,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortSearchDefault: 6,
   },
   {
     label: '物料描述1',
@@ -678,6 +720,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortSearchDefault: 7,
     hiddenInMain: true
   },
   {
@@ -687,6 +730,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortSearchDefault: 7,
     hiddenInMain: true
   },
   {
@@ -696,6 +740,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:true,
     sortTableDefault: 1005,
     form: {
       component: 'InputNumber',
@@ -713,6 +758,32 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    sortTableDefault: 1006,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    sortTableDefault: 1006,
+    form: {
+      component: 'InputNumber',
+    }
+  },
   {
     label: '项目代码',
     field: 'projectCode',
@@ -720,6 +791,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault: 1011,
     hiddenInMain: true
   },
   // {
@@ -735,7 +807,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -751,14 +823,25 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   //   },
   // },
   {
-    label: '备注',
+    label: '原因',
     field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault: 1007,
     hiddenInMain: true
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 1014,
+    hiddenInMain: true,
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -771,6 +854,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 180
     },
     hiddenInMain: true,
+    sortTableDefault: 1014,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -780,15 +864,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
+  
 ]))
 
 //表单校验
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index cb38125b5..15034e48b 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -661,6 +661,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     hiddenInMain: true,
+    isTable:false,
   },
   {
     label: '批次',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index 39a2b2d4e..a98fc71f9 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -63,7 +63,6 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: false,
-
   },
   {
     label: '入库事务类型',
@@ -249,6 +248,8 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
     table: {
       width: 150
     },
@@ -669,18 +670,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
+  
   // {
   //   label: '代码',
   //   field: 'code',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 13245d9e2..c3a8be664 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -308,12 +308,12 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:1,
     form: {
       value: '1',
       componentProps: {
@@ -444,6 +444,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isSearch: true,
     sortSearchDefault:6,
     sortTableDefault:1100,
@@ -528,6 +529,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    isTable:false,
     hiddenInMain:true,
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 1065befd7..64c7573dd 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -139,9 +139,9 @@
     :formAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
     :tableAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
     :tableFormRules="SupplierdeliverInspectionDetailRules"
-    :tableData="ploadQualityReportTableData"
-    @handleAddTable="SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail"
-    @handleDeleteTable="SupplierdeliverInspectionDetailApi.deleteSupplierdeliverInspectionDetail"
+    :tableData="uploadQualityReportTableData"
+    @handleAddTable="handleAddQualityReport"
+    @handleDeleteTable="handleDeleteQualityReport"
     @submitForm="submitFormUploadQualityReport"
     :isShowReduceButton="true"
   >
@@ -617,7 +617,22 @@ const handleOpe = async (id: number) => {
   }
 }
 const ploadQualityReportRef = ref()
-const ploadQualityReportTableData = ref([])
+const uploadQualityReportTableData = ref([])
+
+const handleAddQualityReport = ()=>{
+  const tableFormKeys  = {}
+  SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  uploadQualityReportTableData.value.push(tableFormKeys)
+  console.log('handleAddQualityReport')
+}
+const handleDeleteQualityReport = (row,index)=>{
+  uploadQualityReportTableData.value.splice(index,1)
+  console.log('handleDeleteQualityReport',row)
+
+}
+
 /** 上传质量报告 */
 const handleUploadQualityReport  = async (row) => {
   console.log('SupplierdeliverInspectionDetail',SupplierdeliverInspectionDetail.allSchemas)
@@ -630,12 +645,12 @@ const handleUploadQualityReport  = async (row) => {
   SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
     tableFormKeys[item.field] = item.default ? item.default : ''
   })
-  ploadQualityReportTableData.value = [tableFormKeys]
+  uploadQualityReportTableData.value = [tableFormKeys]
 }
 
 const submitFormUploadQualityReport = async (formType, data) => {
   delete data.number
-  data.subList = ploadQualityReportTableData.value // 拼接子表数据参数
+  data.subList = uploadQualityReportTableData.value // 拼接子表数据参数
   if (formType === 'create') {
     await SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail(data)
     message.success(t('common.createSuccess'))