diff --git a/src/api/wms/deliverRecordMain/index.ts b/src/api/wms/deliverRecordMain/index.ts
index a0f1e4e3e..1feabb40d 100644
--- a/src/api/wms/deliverRecordMain/index.ts
+++ b/src/api/wms/deliverRecordMain/index.ts
@@ -99,12 +99,12 @@ export const inducedProductBatchUpdate = (data) => {
 
 // 修改发货记录信息
 export const inducedProductUpdate = () => {
-  return request.download({ url: '/wms/deliver-record-main/inducedProductUpdate' })
+  return request.download({ url: '/wms/leadership-incorporation-doc-request/inducedProductUpdate' })
 }
 
 // 创建发货记录信息
 export const inducedProductCreate = (data) => {
-  return request.post({ url: '/wms/deliver-record-main/inducedProductCreate',data })
+  return request.post({ url: '/wms/leadership-incorporation-doc-request/inducedProductCreate',data })
 }
 
 
diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts
index d0883cda9..5a12e0f3b 100644
--- a/src/api/wms/warehouse/index.ts
+++ b/src/api/wms/warehouse/index.ts
@@ -22,7 +22,6 @@ export const getWarehousePage = async (params) => {
   }
 }
 
-
 // 查询仓库列表
 export const getWarehouseByBusinessTypeSenior = async (params) => {
     delete params.isSearch
@@ -32,7 +31,7 @@ export const getWarehouseByBusinessTypeSenior = async (params) => {
 
 // 查询仓库列表
 export const getWarehouseByBusinessTypePage = async (params) => {
-    return await request.get({ url: `/wms/warehouse/page`, params })
+    return await request.get({ url: `/wms/warehouse/getWarehouseByBusinessTypePage`, params })
 }
 
 // 校验仓库
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 0c71124df..e589c27dd 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -674,6 +674,15 @@ watch(
     deep: true
   }
 )
+watch(
+  () => props.formAllSchemas,
+  (val) => {
+    formSchema.value = val.formSchema
+  },
+  {
+    deep: true
+  }
+)
 let originFormModel = {}
 const updateOriginFormModel = (data) => {
   originFormModel = JSON.parse(JSON.stringify(data))
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index bf355fdd1..f24522097 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -627,7 +627,6 @@ const handleTableSelect = (row, column, event) => {
 
 // 某个item是否禁用
 const itemIsDisabled = (colum, row) => {
-  console.log(row['disabled_' + colum.field])
   if (row['disabled_' + colum.field] === true || row['disabled_' + colum.field] === false) {
     return Boolean(row['disabled_' + colum.field]) 
   }
diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue
index f1b7574d1..a2f853471 100644
--- a/src/components/XButton/src/ButtonBaseMore.vue
+++ b/src/components/XButton/src/ButtonBaseMore.vue
@@ -15,7 +15,7 @@
     </el-button>
   </div>
   <el-dropdown placement="top-start" v-if="showList().length>3">
-    <el-button link class="more"> 更多 </el-button>
+    <el-button link class="more" type="primary"> 更多 </el-button>
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item v-for="(item, index) in getMoreList" :key="index+3" class="btn-div">
diff --git a/src/views/system/post/PostAreaPermissionForm.vue b/src/views/system/post/PostAreaPermissionForm.vue
index 7466759fe..a8138d537 100644
--- a/src/views/system/post/PostAreaPermissionForm.vue
+++ b/src/views/system/post/PostAreaPermissionForm.vue
@@ -72,8 +72,10 @@ const open = async (row: any) => {
   dialogVisible.value = true
   resetForm()
   // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点
-  areaOptions.value = await PostApi.getPostAreaTreeList()
-  // menuOptions.value = handleTree(await MenuApi.getSimpleMenusList())
+  let array = await PostApi.getPostAreaTreeList()
+  array.forEach(item=>item.name =item.code + '-' + item.name )
+  areaOptions.value =  handleTree(array)
+  // menuOptions.value =  await MenuApi.getSimpleMenusList())
   // 设置数据
   formData.id = row.id
   formData.name = row.name
@@ -108,14 +110,24 @@ const submitForm = async () => {
     //     ...(treeRef.value.getHalfCheckedKeys() as unknown as Array<number>) // 获得半选中的父节点
     //   ]
     // }
-    let array = treeRef.value.getCheckedNodes(false).filter(item => item.id).map(item => {
-      return {
+    let arr = treeRef.value.getCheckedNodes(false).filter(item => item.type == 4)
+     let array = []
+    if (arr && arr.length > 0) {
+       array = arr.map(item => {
+        return {
+          postId:formData.id,
+          locationId:item.id,
+          locationCode:item.code,
+        }
+      })
+    } else {
+      array = [{
         postId:formData.id,
-        locationId:item.id,
-        locationCode:item.code,
-      }
-    })
-    console.log(888, array)
+        locationId:-1,
+        locationCode:'',
+      }]
+    }
+   
     await PostApi.updatePostLocation(array)
     message.success(t('common.updateSuccess'))
     dialogVisible.value = false
@@ -144,7 +156,7 @@ const resetForm = () => {
 
 /** 全选/全不选 */
 const handleCheckedTreeNodeAll = () => {
-  treeRef.value.setCheckedNodes(treeNodeAll.value ? menuOptions.value : [])
+  treeRef.value.setCheckedNodes(treeNodeAll.value ? areaOptions.value : [])
 }
 
 /** 展开/折叠全部 */
diff --git a/src/views/system/role/RoleAssignMenuForm.vue b/src/views/system/role/RoleAssignMenuForm.vue
index 9304532ce..4c459f5a4 100644
--- a/src/views/system/role/RoleAssignMenuForm.vue
+++ b/src/views/system/role/RoleAssignMenuForm.vue
@@ -75,6 +75,7 @@ const open = async (row: RoleApi.RoleVO) => {
   resetForm()
   // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点
   menuOptions.value = handleTree(await MenuApi.getSimpleMenusList())
+  console.log(333,menuOptions.value)
   // 设置数据
   formData.id = row.id
   formData.name = row.name
@@ -143,6 +144,7 @@ const handleCheckedTreeNodeAll = () => {
 /** 展开/折叠全部 */
 const handleCheckedTreeExpand = () => {
   const nodes = treeRef.value?.store.nodesMap
+  console.log(88,treeRef.value?.store.nodesMap)
   for (let node in nodes) {
     if (nodes[node].expanded === menuExpand.value) {
       continue
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index e8649797e..227d49118 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -184,14 +184,14 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '部门',
+  //   field: 'departmentCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '明盘',
     field: 'isOpenCount',
@@ -541,23 +541,6 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 4d5aa8a54..22219509a 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -183,30 +183,6 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 150
-    },
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
-        }
-      }
-    }
-  },
   {
     label: '备注',
     field: 'remark',
@@ -556,24 +532,6 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index d1f6cd14c..2702e1c3b 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -156,14 +156,14 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '部门',
+  //   field: 'departmentCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   // {
   //   label: '接口类型',
   //   field: 'interfaceType',
@@ -456,49 +456,6 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '接口类型',
-  //   field: 'interfaceType',
-  //   dictType: DICT_TYPE.INTERFACE_TYPE,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index bcc8c248a..d3918e677 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -171,30 +171,6 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 150
-    },
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
-    form: {
-      value: userDept.id,
-      component: 'Select',
-      api: () => userDeptArray,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'name',
-          valueField: 'id'
-        }
-      }
-    }
-  },
   {
     label: '备注',
     field: 'remark',
@@ -573,24 +549,6 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
index 62a578423..af4d60e2a 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
@@ -315,6 +315,17 @@ export const CustomerSaleInvoiceDetailRules = reactive({
 })
 
 export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '序号',
+    type:'index',
+    field: 'numberIndex',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '品番',
     field: 'itemCode',
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
index 89b9d5738..19d3fa775 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
@@ -74,7 +74,7 @@
   <!-- 导入 -->
   <ImportFormStep 
       ref="importFormRef" 
-      url="/wms/deliver-record-main/import-parse-file" 
+      url="/wms/leadership-incorporation-doc-request/import-parse-file" 
       :importTemplateData="importTemplateData" 
       :formSchema="DeliverRecordImport.allSchemas.formSchema" 
       :rules="DeliverRecordImportRules"
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
index 4f4f26c84..b18029692 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
@@ -117,7 +117,7 @@
     <template #adjustmentAmount="{ row }" v-if="tabCurrent.prop == 'ShareReconciliation'">
       <div style="position: relative">
         <span>{{ row.adjustmentAmount }}</span>
-        <Icon v-if="row.status==4"
+        <Icon v-if="chooseRow.status==4"
           icon="ep:edit"
           color="#409eff"
           @click="openDetailForm(row)"
@@ -655,6 +655,7 @@ const changeTabs = async (item) => {
     ]
     apiPage.value = CustomerStatementDetailApi.getCustomerToolApportStatementPage
     DetailAllSchemas.value = CustomerStatementShareReconciliation.allSchemas
+console.log(555,DetailAllSchemas.value)
     otherHeadButttonData.value = [
       {
         label: t(`ts.导出`).replace('ts.', ''),
@@ -794,8 +795,6 @@ const openDetailForm = (row) => {
 }
 // 调整金额提交
 const handleDetailSubmitForm = async (formType, data) => {
-  console.log(detailRef.value.tableObjectRef.tableList)
-  
   await CustomerStatementDetailApi.updateAdjustmentAmount(data.id,data.masterId,data.adjustmentAmount)
   message.success(t('common.updateSuccess'))
   detailRef.value.submitUpdateList()
diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue
index a751cfc09..f372f35b3 100644
--- a/src/views/wms/inventoryManage/expectin/index.vue
+++ b/src/views/wms/inventoryManage/expectin/index.vue
@@ -160,6 +160,7 @@ const handleSelectionDelete = async ()=>{
     rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
   })
   if(rows.length==0){
+    message.warning("至少勾选一条数据！")
     return
   }
   try {
diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue
index 98a2b5a09..73df20786 100644
--- a/src/views/wms/inventoryManage/expectout/index.vue
+++ b/src/views/wms/inventoryManage/expectout/index.vue
@@ -160,6 +160,7 @@ const handleSelectionDelete = async ()=>{
     rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
   })
   if(rows.length==0){
+    message.warning("至少勾选一条数据！")
     return
   }
   try {
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
index c4b8f6f2d..fbe9c7036 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
@@ -11,6 +11,14 @@ import * as QadProjectApi from '@/api/wms/qadProject'
 import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
 import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
 
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
+
 /**
  * @returns {Array} 计划外出库记录主表
  */
@@ -345,6 +353,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
   },
   {
     label: '接口类型',
@@ -450,26 +461,26 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
-  },
+  // {
+  //   label: '是否可用',
+  //   field: 'available',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: false,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
 ]))
 
 //表单校验
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
index d2b897430..7ce36142e 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@@ -932,7 +932,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
 //表单校验
 export const UnplannedissueRequestDetailRules = reactive({
   batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' },
+    // { required: true, message: '请输入批次', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   containerNumber:  [
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index c2a452855..115e2e4eb 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -10,6 +10,12 @@ import * as QadProjectApi from '@/api/wms/qadProject'
 
 import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
 import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
 /**
  * @returns {Array} 计划外出库记录主表
@@ -369,6 +375,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
   },
   {
     label: '接口类型',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index c4871a5c3..c197baeb7 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -12,6 +12,15 @@ import * as QadProjectApi from '@/api/wms/qadProject'
 import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
 import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
 
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
+
 /**
  * @returns {Array} 计划外入库记录主表
  */
@@ -338,14 +347,17 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  // {
-  //   label: '部门',
-  //   field: 'departmentCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+  },
   {
     label: '接口类型',
     field: 'interfaceType',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index b475abf6e..1c12643de 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -280,6 +280,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           tfk['itemCode'] = item['code']
           tfk['uom'] = item['uom']
           tfk['validityDays'] = item['validityDays']
+          tfk['isEnableBuy'] =  val[0]['enableBuy']
           tableData.value.push(tfk)
         })
       } else if (formField === 'costcentreCode') {
@@ -855,6 +856,13 @@ const submitForm = async (formType, submitData) => {
       : ''
   })
   try {
+    let newVal = data.subList.some((item) => item.isEnableBuy == 'TRUE')
+    let newVal1 = data.subList.some((item) => item.isEnableBuy == 'FALSE')
+    console.log(newVal,newVal1)
+    if (newVal && newVal1) {
+      message.warning('不能同时选择可制造和可采购的物料')
+      return
+    }
     if (formType === 'create') {
       console.log('【计划外入库子列表】', data.subList)
       if (data.subList.length == 0) {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index 631ea87b9..85eb0367d 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -76,6 +76,9 @@
     :apiDelete="InventorymoveRequestDetailApi.deleteInventorymoveRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @detailOpenForm="detailOpenForm"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowAdd="false"
   />
 
   <!-- 导入 -->
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 019a3be47..1493c0007 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -451,13 +451,13 @@ const isShowMainButton1 = (row, val) => {
   }
     return [
       // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE') }), // 关闭
-      defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1','5']) }), // 发布
-      defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
-      defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
-      defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架
-      // defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改
-      defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE'),hasPermi: 'wms:purchase-plan-main:close' }), // 关闭
+      defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) ,hasPermi: 'wms:purchase-plan-main:publish'}), // 发布
+      defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:accept'}), // 接受
+      defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:noaccept'}), // 不接受
+      defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:unpublish'}), // 下架
+      defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) , hasPermi: 'wms:purchase-plan-main:update'}), // 修改
+      defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:edit' }), // 编辑
       // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
       {
         label: t('ts.创建供应商发货申请'),
@@ -466,7 +466,7 @@ const isShowMainButton1 = (row, val) => {
         type: 'primary',
         icon: '',
         color: '',
-        hasPermi: '',
+        hasPermi: 'wms:purchase-plan-main:supplyapply',
         link: true // 文本展现按钮
       }
     ]
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index ca0c6b8bd..2261ef305 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -279,6 +279,17 @@ export const PurchasePlanMain = useCrudSchemas(
         width: 150
       },
     },
+    {
+      label: '班次',
+      field: 'xxxxx',
+      sort: 'custom',
+      isTable: true,
+      isForm: false,
+      sortTableDefault: 14,
+      table: {
+        width: 150
+      },
+    },
     {
       label: '收货人',
       field: 'contacts',
@@ -461,7 +472,7 @@ export const PurchasePlanMain = useCrudSchemas(
       isTable: true,
       isForm: false,
       formatter: dateFormatter,
-      sortTableDefault: 13,
+      sortTableDefault: 15,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       },