diff --git a/README.md b/README.md
index 1bb4abe15..e5f4b9509 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## dev发布2024-05-23-001
+## dev发布2024-05-23-002
 **xxxx.data.ts 文件配置说明**
 **form表单查询弹窗配置**
 form: {
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 628ea1968..55a96a516 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1009,7 +1009,8 @@ export default {
     请先选择要打印的数据:'Please first select the data you want to print',
     创建标签失败:'Failed to create label',
     生产日期不可以大于过期日期:'The production date cannot be longer than the expiration date',
-    '计划到货时间大于要货计划送达日期是否继续？':'The planned arrival time is greater than the planned delivery date. Do you want to continue?',
+    '计划到货时间大于':'The planned arrival time is greater than ',
+    '是否继续？':'. Do you want to continue?',
     '子表明细不能为空!':'Subindicates that the detail cannot be empty!',
     采购申请生成成功:'The purchase request was successfully generated',
     '确认生成采购申请吗？':'Confirm to generate purchase application?',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 6bb427ae3..6c12136b6 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1009,7 +1009,8 @@ export default {
     请先选择要打印的数据:'请先选择要打印的数据',
     创建标签失败:'创建标签失败',
     生产日期不可以大于过期日期:'生产日期不可以大于过期日期',
-    '计划到货时间大于要货计划送达日期是否继续？':'计划到货时间大于要货计划送达日期是否继续？',
+    '计划到货时间大于':'计划到货时间大于',
+    '是否继续？':'是否继续？',
     '子表明细不能为空!':'子表明细不能为空!',
     采购申请生成成功:'采购申请生成成功',
     '确认生成采购申请吗？':'确认生成采购申请吗？',
diff --git a/src/views/eam/maintenance/index.vue b/src/views/eam/maintenance/index.vue
index fc14f5b21..59006e42f 100644
--- a/src/views/eam/maintenance/index.vue
+++ b/src/views/eam/maintenance/index.vue
@@ -66,10 +66,9 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-import * as BasicInspectionOptionApi from "@/api/eam/basicInspectionOption";
 import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
-import { ToolAccounts } from "@/views/eam/toolAccounts/ToolAccounts.data";
+import { ToolAccounts } from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
 
 defineOptions({ name: 'Maintenance' })
diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 31d39754a..d94c5f7c6 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -515,7 +515,7 @@ const doPublishPlan=  ()=>{
   tempBom: detailData.value.tempBom,
   workMode: detailData.value.workMode,
   planDate: detailData.value.planDate,
-  startTime: detailData.value.planDate,
+  startTime: detailData.value.startTime,
   endTime: detailData.value.endTime,
   taskMode: detailData.value.taskMode,
   batchCode:detailData.value.batchCode,
diff --git a/src/views/qms/inspectionRecord/detail.vue b/src/views/qms/inspectionRecord/detail.vue
index 5a8f664d4..857ac62bd 100644
--- a/src/views/qms/inspectionRecord/detail.vue
+++ b/src/views/qms/inspectionRecord/detail.vue
@@ -35,7 +35,7 @@
           <el-tab-pane
             v-for="item in data.subList"
             :key="item.name"
-            :label="item.processCode"
+            :label="item.processDescribe"
             :name="item.name"
           >
             <div class="small-title">检验工序</div>
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index 6c1e22092..52045b242 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -36,6 +36,8 @@ export const CallmaterialsRules = reactive({
   warehouseCode: [required],
   workshopCode: [required],
   workStationCode: [required],
+  uom: [required],
+  callmaterialQty: [required]
 })
 
 export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index ba361799f..d6f628ede 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Callmaterials.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Callmaterials.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -291,7 +291,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
     () => tableObject.tableList,
     () => {
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
index 79d4d6b7d..8f68f72a9 100644
--- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Package.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -209,7 +209,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
   () => tableObject.tableList,
   () => {
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index ea82cd331..d7fd2b8da 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Balance.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Balance.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -135,6 +135,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
   () => tableObject.tableList,
   () => {
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 0a397834e..73bda1c1a 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -605,7 +605,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key: 'code', // 查询列表中字段
         value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述！1111', // 当前置条件为空时 弹出信息提示
+        message: '请选择领用描述！', // 当前置条件为空时 弹出信息提示
         isMainValue: true // 表示查询条件不是主表的字段的值
       }]
     },
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
index 1525201c3..56ad57950 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@@ -121,6 +121,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
+  
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
@@ -144,6 +145,24 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '优先级',
     field: 'priority',
@@ -695,6 +714,22 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '原因',
     field: 'reason',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index c875677b4..dc184fb84 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -142,6 +142,24 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '出库事务类型',
     field: 'outTransactionType',
@@ -510,6 +528,22 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
   },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '原因',
     field: 'reason',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 7986b0870..20a7dce2a 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -90,9 +90,9 @@
     :isShowButton="false"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
+    @searchTableSuccess="searchTableLabelSuccess"
+    :isShowReduceButton="false"
     @submitForm="submitFormLabel"
-    
   />
 
   <!-- 导入 -->
@@ -191,11 +191,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           row['itemCode'] = val[0]['code']
           row['uom'] = val[0]['uom']
         }
-      } else {
+      } else if(formField === 'costcentreCode'){
+        row['costcentreCode'] = val[0]['costcentreCode']
+      } else if(formField === 'qadProjectCode'){
+        row['qadProjectCode'] = val[0]['projectCode']
+      }else {
         row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
+      if(formField === 'usageDescription'){
+        setV['usageDescription'] = val[0]['usageDescription']
+        setV['usageCode'] = val[0]['code']
+      }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
@@ -213,10 +221,33 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['itemCode'] = val[0]['code']
       setV['uom'] = val[0]['uom']
     }
+    if(formField === 'costcentreCode'){
+      setV['costcentreCode'] = val[0]['costcentreCode']
+    }
+    if(formField === 'qadProjectCode'){
+      setV['qadProjectCode'] = val[0]['projectCode']
+    }
     formRef.setValues(setV)
   })
 }
 
+
+// 查询标签表格页面返回
+const searchTableLabelSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      if(formField === 'packUnit'){
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index aa618a17e..0df221d91 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -2,8 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
-import * as BalanceApi  from '@/api/wms/balance'
-import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
 
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
@@ -12,14 +12,8 @@ import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/w
 import * as WarehouseApi from "@/api/wms/warehouse";
 import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
 import * as LocationApi from "@/api/wms/location";
-import {
-  Productionlineitem
-} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data";
-import * as ProductionlineitemApi from "@/api/wms/productionlineitem";
-import {
-  Supplieritem
-} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
-import * as SupplieritemApi from "@/api/wms/supplieritem";
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
 
 const { t } = useI18n() // 国际化
 
@@ -150,6 +144,35 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请科目账户信息',
+        searchField: 'usageDescription',
+        searchTitle: '科目账户信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage
+      }
+    }
+  },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
@@ -401,6 +424,9 @@ export const UnplannedreceiptRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  usageDescription:[
+    { required: true, message: '请选择领用描述', trigger: 'blur' }
+  ],
 })
 
 /**
@@ -749,6 +775,94 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isTableForm: false,
     isForm: false,
   },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '选择成本中心',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心信息',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'code', // 查询列表中字段
+        value: 'usageCode', // 指查询具体值
+        message: '请选择领用描述！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择成本中心',
+        searchField: 'costcentreCode',
+        searchTitle: '成本中心信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'code', // 查询列表中字段
+          value: 'usageCode', // 指查询具体值
+          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          isMainValue: true // 表示查询条件不是主表的字段的值
+        }]
+      }
+    }
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '选择科目代码',
+      searchField: 'projectCode',
+      searchTitle: '科目代码信息',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'code', // 查询列表中字段
+        value: 'usageCode', // 指查询具体值
+        message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      },{
+        key: 'costcentreCode', // 查询列表中字段
+        value: 'costcentreCode', // 指查询具体值
+        message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择成本中心',
+        searchField: 'projectCode',
+        searchTitle: '成本中心信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'code', // 查询列表中字段
+          value: 'usageCode', // 指查询具体值
+          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          isMainValue: true // 表示查询条件不是主表的字段的值
+        },{
+          key: 'costcentreCode', // 查询列表中字段
+          value: 'costecentreCode', // 指查询具体值
+          message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+          isMainValue: false // 表示查询条件不是主表的字段的值
+        }]
+      }
+    }
+  },
   {
     label: '原因',
     field: 'reason',
@@ -890,6 +1004,12 @@ export const UnplannedreceiptRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  costcentreCode:[
+    { required: true, message: '请选择成本中心代码', trigger: 'change' }
+  ],
+  qadProjectCode:[
+    { required: true, message: '请选择科目代码', trigger: 'change' }
+  ]
 })
 
 
@@ -898,64 +1018,50 @@ export const UnplannedreceiptRequestDetailRules = reactive({
  */
 export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
-    field: 'productionLineCodePackage',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'productionLineCode', // 查询弹窗赋值字段
-      searchTitle: '生产线物料关系信息', // 查询弹窗标题
-      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      }]
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
-    label: '供应商代码',
-    field: 'supplierItemCode',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-      searchField: 'supplierCode', // 查询弹窗赋值字段
-      searchTitle: '供应商信息', // 查询弹窗标题
-      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
-      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      }]
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '物料描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
     },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '批次',
@@ -1113,24 +1219,8 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -1145,115 +1235,80 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '来源工位代码',
-    field: 'workStationCode',
+    label: '包装规格',
+    field: 'packUnit',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
+      width: 150,
       componentProps: {
-        disabled: true
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择物料代码',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
       }
-    }
-  },
-  {
-    label: '来源库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
     tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择物料代码',
+          isTableRowValue: true, 
+          isMainValue:false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
     }
   },
   {
-    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',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
     form: {
       componentProps: {
-        disabled: true
+        disabled: true,
       }
-    }
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
     tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
+      disabled: true,
     }
-  }
+  },
 ]))
 
 //表单校验
 export const UnplannedreceiptRequestDetailLabelRules = reactive({
-  supplierItemCode: [
-    { required: true, message: '请选择供应商', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
-  productionLineCodePackage: [
-    { required: true, message: '请选择生产线', trigger: 'change' }
-  ]
 })
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
index 57e1fa192..8d4cfb33f 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
@@ -611,7 +611,7 @@ export const ProductputawayJobMainRules = reactive({
  */
 export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采购订单号',
+    label: '订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
index 6a9a85fce..d16012baf 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
@@ -390,7 +390,7 @@ export const ProductputawayRecordMainRules = reactive({
  */
 export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采购订单号',
+    label: '订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index 9b28457f2..ec330ec7e 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -420,7 +420,7 @@ export const ProductputawayRequestMainRules = reactive({
  */
 export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采购订单号',
+    label: '订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 7a4700efd..f30bc9ad8 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -198,7 +198,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
   () => tableObject.tableList,
   () => {
@@ -277,7 +280,7 @@ const buttonTableClick = async (val, row) => {
 }
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/954234424010665984?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/954878108028801024?token=' + getAccessToken())
 const handleDocumentPrint = async (row) => {
   window.open(src.value+'&id='+row.masterId)
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 700b9eeca..4d2d3fbf3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -155,7 +155,9 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
             setV['contactName']=val[0]['contacts']
             setV['contactPhone']=val[0]['phone']
             setV['contactEmail']=val[0]['email']
-            setV['taxRate']=val[0]['taxRate']
+            if(formRef.formModel.taxRate==0){
+              setV['taxRate']=val[0]['taxRate']
+            }
             formRef.setValues(setV)
             //明细
             val.forEach(item=>{
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 27f787357..8f3c8d6bc 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -408,7 +408,6 @@ const isShowMainButton = (row, val) => {
   }
 }
 
-
 // 根据状态返回该按钮是否显示
 const isShowMainButtonLabel = (row, val) => {
   if (val.indexOf(row.status) > -1) {
@@ -900,7 +899,7 @@ const submitForm = async (formType, data) => {
       let planArriveStr = formatDate(data.planArriveTime);
       if(planArriveStr > planArriveTimeStr.value){
         let confirmFlag = false;
-        await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续？')).then(() => {
+        await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续？')}`).then(() => {
           console.log("选择了OK")
           //选择OK
         }).catch(() => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index d65152011..d5c97bbfb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -205,10 +205,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         getSearchTableData(val[0]['number'],formField,searchField)
 
         // 设置计划到货时间
-        let beginTime =  val[0]['endTime']
-        let deliveryDate =  formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
-        planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
-        setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+        
+        if(val[0]['deliveryDate']){
+          let beginTime =  val[0]['endTime'] || '00:00'
+          let deliveryDate =  formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
+          planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
+          setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+        }
         // 清空子表数据
         tableData.value = []
       }
@@ -280,7 +283,7 @@ const submitForm = async (formType, data) => {
       let planArriveStr = formatDate(data.planArriveTime);
       if(planArriveStr > planArriveTimeStr.value){
         let confirmFlag = false;
-        await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续？')).then(() => {
+        await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续？')}`).then(() => {
           console.log("选择了OK")
           //选择OK
         }).catch(() => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 4bac09e28..fd000436c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -505,7 +505,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 480,
+      width: 350,
       fixed: 'right'
     },
   }
@@ -1123,8 +1123,7 @@ export const SupplierdeliverRequestDetailRules = reactive({
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  
-  secondPackQty:[required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
+  secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
 })
 
 export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([