diff --git a/.env.development b/.env.development
index 2f7bcbecf..c51be5f22 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,12 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:12080'
+# VITE_BASE_URL='http://localhost:12080'
+# VITE_BASE_URL='http://192.168.1.49:12080'
+# VITE_BASE_URL='http://192.168.1.254:12080'
+VITE_BASE_URL='http://dev.ccwin-in.com:28050/api'
+# VITE_BASE_URL='http://dev.ccwin-in.com:28040/api'
+# VITE_BASE_URL='http://192.168.1.254:12080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'
diff --git a/README.md b/README.md
index 2953275d5..284f3f170 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ form: {
       value:'undefined',//默认值，设置为'undefined'-->实际是undefined(解决SelectV2不显示占位符placeholder)
       enterSearch: true, //可输入回车  对应绑定事件：@onEnter="onEnter"
       isSearchList: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       hiddenFilterButton:true,//是否隐藏筛选按钮
diff --git a/package.json b/package.json
index 2e2eb6e88..6fe857591 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "cropperjs": "^1.6.1",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.10",
+    "decimal.js": "^10.4.3",
     "diagram-js": "^12.3.0",
     "echarts": "^5.4.3",
     "echarts-wordcloud": "^2.1.0",
diff --git a/src/api/home/index.ts b/src/api/home/index.ts
index bd8ef5eb9..092262a85 100644
--- a/src/api/home/index.ts
+++ b/src/api/home/index.ts
@@ -4,7 +4,10 @@ import request from '@/config/axios'
 export const getSupplierData = async () => {
   return await request.get({ url: `/wms/index/indexSupplier` })
 }
-
+// WMS首页
+export const getWmsData = async () => {
+  return await request.get({ url: `/wms/index/indexWMS` })
+}
 // 原料管理员首页
 export const getMaterialData = async () => {
   return await request.get({ url: `/wms/index/indexMaterial` })
diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 944d0f0fd..e900faf38 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -55,7 +55,7 @@ const getPageParams = (params)=>{
   }
   params.supplierCode = ''
 
-  // 物料代码
+  // 品番
   if(params.itemCode&&params.itemCode.length>0){
     let keyValue = params.itemCode.split(' ')
     keyValue.forEach(item=>{item = item.trim()})
diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index cbb7bfb59..3d4481fbd 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -104,7 +104,7 @@ const getPageParams = (params)=>{
   }
   params.supplierCode = ''
 
-  // 物料代码
+  // 品番
   if(params.itemCode&&params.itemCode.length>0){
     let keyValue = params.itemCode.split(' ')
     keyValue.forEach(item=>{item = item.trim()})
@@ -133,6 +133,18 @@ export const exportDemandforecastingMain = async (params) => {
   }
 }
 
+// 导出要货预测主 Excel
+export const exportDemandforecastingPlannnerMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
+  } else {
+    params = getPageParams(params)
+    return await request.download({ url: `/wms/demandforecasting-main/export-excel-planner`, params })
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/demandforecasting-main/get-import-template' })
@@ -156,4 +168,8 @@ export const updateIsRead = async (data) => {
   return await request.post({ url: `/wms/demandforecasting-main/updateIsRead`,data })
 }
 
+export const publish = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/publishDemandForecast`,data })
+}
+
 
diff --git a/src/api/wms/inventoryinitRecordDetail/index.ts b/src/api/wms/inventoryinitRecordDetail/index.ts
index fe2d27f22..ad5e93142 100644
--- a/src/api/wms/inventoryinitRecordDetail/index.ts
+++ b/src/api/wms/inventoryinitRecordDetail/index.ts
@@ -77,4 +77,9 @@ export const importTemplate = () => {
 // 批量打印
 export const printLabelBatchByIdSelection = async (data: any) => {
   return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchById` ,data})
+}
+
+// 批量打印
+export const printLabelBatchByIdSelectionForYT = async (data: any) => {
+  return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchByIdForYT` ,data})
 }
\ No newline at end of file
diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts
index 900d8475d..6af9d1007 100644
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@@ -122,7 +122,7 @@ export const selectConfigToItembasic = async (params) => {
   }
 }
 
-// 根据物料代码查计量单位
+// 根据品番查计量单位
 export const getQueryItemCodeInfo = async (data) => {
   return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data })
 }
diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index 6bb42be07..52fa6a9c2 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -122,6 +122,11 @@ export const batchPrintingLables = async (data: any) => {
   return await request.post({ url: `/wms/package/batchPrintingLables`, data })
 }
 
+// 批量打印标签英泰多选
+export const batchPrintingLablesForYT = async (data: any) => {
+  return await request.post({ url: `/wms/package/batchPrintingLablesForYT`, data })
+}
+
 // 打印标签获取包装列表
 export const getLabel = async (id: number) => {
   return await request.get({ url: `/wms/package/getLabel?id=` + id })
@@ -159,3 +164,8 @@ export const getBalanceToPackageByIntex = async (itemCode: String,batch: String)
 export const getBalanceToPackageSelection = async (data: any) => {
   return await request.post({ url: `/wms/balance/batchPrintLabel` ,data})
 }
+
+// 获取包装信息
+export const getPackageByBarbasic = async (relateNumber) => {
+  return await request.get({ url: `/wms/package/getPackageByBarbasic?relateNumber=${relateNumber}`})
+}
diff --git a/src/api/wms/supplierdeliverRecordDetail/index.ts b/src/api/wms/supplierdeliverRecordDetail/index.ts
index 2efc8aa17..7ddd52e08 100644
--- a/src/api/wms/supplierdeliverRecordDetail/index.ts
+++ b/src/api/wms/supplierdeliverRecordDetail/index.ts
@@ -95,4 +95,16 @@ export const queryChildPickingNumber = async (params) => {
   } else {
     return await request.get({ url: `/wms/supplierdeliver-record-detail/queryChildPickingNumberPage`, params })
   }
+}
+
+// 查询供应商发货记录
+// 查询供应商发货记录子列表
+export const getSupplierdeliverRecordDetailPageWMS = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierdeliver-record-detail/seniorWMS', data })
+  } else {
+    return await request.get({ url: `/wms/supplierdeliver-record-detail/pageWMS`, params })
+  }
 }
\ No newline at end of file
diff --git a/src/api/wms/supplierinvoiceInvoiced/index.ts b/src/api/wms/supplierinvoiceInvoiced/index.ts
index 9be7c7d15..85baf8e41 100644
--- a/src/api/wms/supplierinvoiceInvoiced/index.ts
+++ b/src/api/wms/supplierinvoiceInvoiced/index.ts
@@ -58,7 +58,10 @@ export const deleteSupplierinvoiceInvoiced = async (id: number) => {
 export const exportSupplierinvoiceInvoiced = async (params) => {
   return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel`, params })
 }
-
+// 导出待开票 Excel
+export const exportSupplierinvoiceInvoicedWork = async (params) => {
+  return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-work`, params })
+}
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplierinvoice-invoiced/get-import-template' })
diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index ca9f37c87..98488d09a 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -38,6 +38,7 @@ const props = defineProps({
     default: () => ({})
   }
 })
+const schema = ref(props.schema)
 
 const { getPrefixCls } = useDesign()
 
@@ -82,6 +83,20 @@ const showAll = () =>{
   isShow.value = !isShow.value
  
 }
+
+// 默认排序
+const updateSort = (val) => {
+  console.log(999,val)
+  val.forEach(item=>{
+    if(!item.sortDetailDefault){
+      item.sortDetailDefault = 999 // 默认999
+    }
+  })
+  val.sort((column1,column2)=>{
+    return column1.sortDetailDefault - column2.sortDetailDefault
+  })
+}
+updateSort(schema.value)
 </script>
 
 <template>
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 6392c5519..4e4dea19f 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -49,6 +49,7 @@
             :data="detailData"
             :schema="allSchemas.detailSchema"
             :columns="2"
+            :key="updateKey"
           />
           <!-- 检验工序用到插槽 -->
           <slot v-if="isBasic && !tabsExtend" :data="detailData" name="basicBottom" :key="updateKey"></slot>
@@ -498,6 +499,17 @@ const props = defineProps({
     required: false,
     default: false
   },
+  isHaveDetailTabs:{
+    type: Boolean,
+    required: true,
+    default: false
+  },
+  // 主列表数据
+  detailDataProps: {
+    type: Object,
+    required: true,
+    default: null
+  }
 })
 const allSchemas = ref(props.allSchemas)
 const detailAllSchemasRef = ref(props.detailAllSchemas)
@@ -535,10 +547,13 @@ const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
 
 if (props.isBasic == true) {
   if (tabsList.value && tabsList.value.length > 0) {
-    tabsList.value.unshift({
-      label: '详情',
-      prop: 'Detail'
-    })
+    if (props.isHaveDetailTabs) {
+        tabsList.value.unshift({
+        label: '详情',
+        prop: 'Detail'
+      })
+    }
+    
   }
 } else {
   if (tabsList.value && tabsList.value.length > 0) {
@@ -680,7 +695,7 @@ const getAnnexFileList =  async (row) => {
         annexList,
         hasSubDetail:item.hasSubDetail||false,
         subDetailTableData:item.subDetailTableData,
-        fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
+        fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg','ofd'],
         limit:item.limit||10,
         fileSize:item.fileSize||5,
         showPreview:item.showPreview||false, // 是否展示预览按钮
@@ -887,7 +902,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     }
   }
 }
-const updateList = ()=>{
+const updateList =async  ()=>{
   
   // 刷新
   if (tableObjectRef.value.params.filters && tableObjectRef.value.params.filters.length > 0) {
@@ -895,7 +910,7 @@ const updateList = ()=>{
       filters: tableObjectRef.value.params.filters
     })
   } else {
-    tableMethodsRef.value.getList()
+    await tableMethodsRef.value.getList()
   }
 }
 
@@ -1100,7 +1115,7 @@ const submitForm = async (formType, data) => {
 const submitUpdateList = async ()=>{
   formRef.value.dialogVisible = false
   // 刷新当前列表
-  updateList()
+  await updateList()
   updateKey.value += 1
 }
 
@@ -1134,7 +1149,8 @@ const emit = defineEmits([
   'formFormDateChange',
   'buttonBaseClick',
   'handleMainFefresh',
-  'handleSubmitForm'
+  'handleSubmitForm',
+  'changeDetailList'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -1269,6 +1285,9 @@ watch(
     tableMethodsRef.value = tableMethods
     const { getList } = tableMethods
     await getList()
+    
+    emit('changeDetailList',props.apiPage)
+
   }
 )
   watch(
@@ -1279,6 +1298,34 @@ watch(
     {
       deep: true
     }
+)
+watch(
+    () => props.detailDataProps,
+    (val) => {
+      detailData.value = val
+    },
+    {
+      deep: true
+    }
+)
+watch(
+    () => props.allSchemas,
+  (val) => {
+      allSchemas.value =val
+      // if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
+      //   if (allSchemas.value) {
+      //     allSchemas.value.detailSchema = val.detailSchema.filter(item => item.field != 'packingNumber')
+      //   }
+      //   if (detailAllSchemasRules.value&&detailAllSchemasRules.value.packingNumber) {
+      //     delete detailAllSchemasRules.value.packingNumber
+      //   }
+      // }
+      updateKey.value++
+     
+    },
+    {
+      deep: true
+    }
   )
 defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent,openForm,tableObjectRef}) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index 7cbf987b0..6d18766ab 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -116,7 +116,8 @@ const props = defineProps({
 const message = useMessage() // 消息弹窗
 const route = useRoute() // 路由信息
 const popoverVisible = ref(false)
-const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (item.field != "action"&&!item.hiddenSearchHigh)))
+const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (item.field != "action" && !item.hiddenSearchHigh)))
+console.log(988,searchOption_high.value)
 const moreListData = ref({
   filters:[]
 })
@@ -390,7 +391,14 @@ const remoteMethod = (query, array) => {
     options.value = userListAll.value
   }
 }
-
+watch(
+  () =>props.allSchemas,
+  () => {
+    searchOption_high.value = props.allSchemas?.tableColumns.filter(item => (item.field != "action" && !item.hiddenSearchHigh))
+  },{
+    deep: true
+  }
+)
 defineExpose({
   popoverVisible
 })
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index 76b9efa80..0f44e08bb 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -104,7 +104,6 @@ export default defineComponent({
 
     const setColumn = (columnProps: TableSetPropsType[], columnsChildren?: TableColumn[]) => {
       let { columns } = unref(getProps)
-      console.log(888,props.isShowPackNumber)
       if (!wsCache.get('ShowPackingNumber')&&!props.isShowPackNumber) {
         if (columns) {
           columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber')
@@ -175,7 +174,6 @@ export default defineComponent({
     
     //清空选择
     const clearSelection  = ()=>{
-      console.log('clearSelection')
       elTableRef.value!.clearSelection()
     }
     
@@ -348,14 +346,13 @@ export default defineComponent({
         border
       } = unref(getProps)
       
-      console.log(999,props.isShowPackNumber)
       if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
         if (columns) {
          columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber')
         }
       }
       //默认排序
-      // updateSort(columns)
+      updateSort(columns)
       return [...[renderTableExpand()], ...[renderTableSelection()]].concat(
         (columnsChildren || columns).map((v) => {
           const zhName = v.label || '';//中文名称
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index f24522097..35c8ffc4d 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -97,7 +97,7 @@
               :type="headerItem?.tableForm?.inputType"
               :placeholder="
                 t(
-                  `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`
+                  `ts.${headerItem?.tableForm?.isPlaceholder === false ? '' :( headerItem?.tableForm?.placeholder || '请输入' + headerItem.label)}`
                 ).replace('ts.', '')
               "
               :disabled="itemIsDisabled(headerItem, row)"
diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue
index a2f853471..deeec5238 100644
--- a/src/components/XButton/src/ButtonBaseMore.vue
+++ b/src/components/XButton/src/ButtonBaseMore.vue
@@ -14,11 +14,11 @@
       <span :style="{width:item.width+'px'||'auto'}" :class="[item.width?'ellipsis':'']">{{ item.label }}</span>
     </el-button>
   </div>
-  <el-dropdown placement="top-start" v-if="showList().length>3">
+  <el-dropdown placement="top-start" v-if="showList().length>2">
     <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">
+        <el-dropdown-item v-for="(item, index) in getMoreList" :key="index+2" class="btn-div">
           <el-button
             v-show="!item.hide"
             :type="item.type"
@@ -80,13 +80,13 @@ const showList = ()=>{
 }
 const getMoreList = computed(()=>{
   let list = showList()
-  return list.slice(3)
+  return list.slice(2)
 })
 const getButtonList = computed(()=>{
   let list = showList()
-  if(list.length>3){
+  if(list.length>2){
     console.log('list===',list)
-    return list.slice(0, 3)
+    return list.slice(0, 2)
   }
   return list
 })
diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue
index 67ea37a33..54bb2fa85 100644
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -65,6 +65,7 @@ onBeforeUnmount(() => {
           <Icon :size="18" class="cursor-pointer" color="#ffffff" icon="ep:bell" @click="getList" />
         </ElBadge>
       </template>
+      <ElScrollbar max-height="calc(100vh - 80px)">
       <ElTabs v-model="activeName">
         <ElTabPane label="我的站内信" name="notice">
           <div class="message-list">
@@ -88,7 +89,9 @@ onBeforeUnmount(() => {
       <div style="margin-top: 10px; text-align: right">
         <XButton preIcon="ep:view" title="查看全部" type="primary" @click="goMyList" />
       </div>
+      </ElScrollbar>
     </ElPopover>
+    
   </div>
 </template>
 <style lang="scss" scoped>
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index bde9ea22e..cbb323a08 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -528,8 +528,8 @@ export default {
     money:'Money',
     material_code:'Material Code',
     material_name:'Material Name',
-    material_description1:'Material Description1',
-    material_description2:'Material Description2',
+    material_abbreviation:'Material Abbreviation',
+    material_description:'Material Description',
     amount:'Amount',
     measuring_unit:'Measuring Unit',
     item_cde:'Item Code',
@@ -635,7 +635,7 @@ export default {
     是:'Yes',
     否:'No',
     供应商代码:'Supplier Code',
-    物料代码:'Material Code',
+    品番:'Material Code',
     单据号:'Document Number',
     订单类型:'Order Type',
     状态:'State',
@@ -668,7 +668,7 @@ export default {
     '税率(%)':'Tax Rate(%)',
     生效时间:'Effective Time',
     失效时间:'Expiration Time',
-    供应商物料代码:'Supplier material code',
+    供应商品番:'Supplier material code',
     供应商计量单位:'Supplier measuring unit',
     转换率:'Conversion Rate',
     默认收货库位:'Default receiving warehouse location',
@@ -756,9 +756,9 @@ export default {
     批次:'Batch',
     到货日期:'Arrival date',
     过期日期:'Expiration date',
-    物料名称:'Material Name',
-    物料描述1:'Material Description1',
-    物料描述2:'Material Description2',
+    品名:'Material Name',
+    背番:'Material Abbreviation',
+    描述:'Description',
     项目代码:'Item Code',
     质检明细:'Quality inspection details',
     履历表明细:'Details of your resume',
@@ -933,7 +933,7 @@ export default {
     序号:'Serial Number',
     版本:'Version',
     地点:'Place',
-    '影响明细中物料代码，需在供应商物料中维护':'The material code in the details is affected ， must be maintained in the supplier\'s material',
+    '影响明细中品番，需在供应商物料中维护':'The material code in the details is affected ， must be maintained in the supplier\'s material',
     是否外部资源:'External resource or not',
     注意事项:'Announcements',
     导入模式:'Import Mode',
@@ -952,8 +952,8 @@ export default {
     用户信息:'User Information',
     请选择供应商:'Please select a supplier',
     请选择供应商代码:'Please select a vendor code',
-    请选择物料代码:'Please select material code',
-    请输入供应商物料代码:'Please input  the supplier material code',
+    请选择品番:'Please select material code',
+    请输入供应商品番:'Please input  the supplier material code',
     请选择库位代码:'Please input the location code',
     ERP库位:'ERP Location Code',
     单价:'Unit Price',
@@ -1024,7 +1024,7 @@ export default {
     审批通过:'Approve',
     要货预测主:'Demand forecast master data',
     要货预测主导入模版:'Demand forecast master data leads into the template',
-    创建供应商发货申请:'Create a supplier shipping request',
+    创建发货申请:'Create a shipping request',
     '是否重新打开所选中数据？':'Do you want to reopen the selected data?',
     '请先上传自检报告!':'Please upload the self-test report first!',
     '提交审批成功!':'Submitted for approval!',
@@ -1056,6 +1056,8 @@ export default {
     合同附件:'Appendix to the contract',
     发票附件:'Invoice Attachment',
     货运单附件:'Attachment to the waybill',
+    发货单附件:'Dispatch note',
+    对账单附件:'Statement of account',
     其他附件:'Other Attachment',
     打印明细:'Print Detail',
     打印全部发货单:'Print all invoices',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index c0de5bab8..1bd7512ce 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -527,10 +527,10 @@ export default {
     cause:'原因',
     unit_price:'单价',
     money:'金额',
-    material_code:'物料代码',
-    material_name:'物料名称',
-    material_description1:'物料描述1',
-    material_description2:'物料描述2',
+    material_code:'品番',
+    material_name:'品名',
+    material_abbreviation:'背番',
+    description:'描述',
     amount:'数量',
     measuring_unit:'计量单位',
     item_code:'项目代码',
@@ -640,7 +640,7 @@ export default {
     是:'是',
     否:'否',
     供应商代码: '供应商代码',
-    物料代码:'物料代码',
+    品番:'品番',
     单据号:'单据号',
     订单类型:'订单类型',
     状态:'状态',
@@ -673,7 +673,7 @@ export default {
     '税率(%)':'税率(%)',
     生效时间:'生效时间',
     失效时间:'失效时间',
-    供应商物料代码:'供应商物料代码',
+    供应商品番:'供应商品番',
     供应商计量单位:'供应商计量单位',
     转换率:'转换率',
     默认收货库位:'默认收货库位',
@@ -761,9 +761,9 @@ export default {
     批次:'批次',
     到货日期:'到货日期',
     过期日期:'过期日期',
-    物料名称:'物料名称',
-    物料描述1:'物料描述1',
-    物料描述2:'物料描述2',
+    品名:'品名',
+    背番:'背番',
+    描述:'描述',
     项目代码:'项目代码',
     质检明细:'质检明细',
     履历表明细:'履历表明细',
@@ -938,7 +938,7 @@ export default {
     序号:'序号',
     版本:'版本',
     地点:'地点',
-    '影响明细中物料代码，需在供应商物料中维护':'影响明细中物料代码，需在供应商物料中维护',
+    '影响明细中品番，需在供应商物料中维护':'影响明细中品番，需在供应商物料中维护',
     是否外部资源:'是否外部资源',
     注意事项:'注意事项',
     导入模式:'导入模式',
@@ -957,8 +957,8 @@ export default {
     用户信息:'用户信息',
     请选择供应商:'请选择供应商',
     请选择供应商代码:'请选择供应商代码',
-    请选择物料代码:'请选择物料代码',
-    请输入供应商物料代码:'请输入供应商物料代码',
+    请选择品番:'请选择品番',
+    请输入供应商品番:'请输入供应商品番',
     请选择库位代码:'请选择库位代码',
     ERP库位:'ERP库位',
     单价:'单价',
@@ -1029,7 +1029,7 @@ export default {
     审批通过:'审批通过',
     要货预测主:'要货预测主',
     要货预测主导入模版:'要货预测主导入模版',
-    创建供应商发货申请:'创建供应商发货申请',
+    创建发货申请:'创建发货申请',
     '是否重新打开所选中数据？':'是否重新打开所选中数据？',
     '请先上传自检报告!':'请先上传自检报告!',
     '提交审批成功!':'提交审批成功!',
@@ -1062,6 +1062,8 @@ export default {
     合同附件:'合同附件',
     发票附件:'发票附件',
     货运单附件:'货运单附件',
+    发货单附件:'发货单附件',
+    对账单附件:'对账单附件',
     其他附件:'其他附件',
     打印明细:'打印明细',
     打印全部发货单:'打印全部发货单',
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 93b4a8b26..d95896c9e 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -36,7 +36,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   {
     path: '/redirect',
     component: Layout,
-    name: 'Redirect',
+    name: '',
     children: [
       {
         path: '/redirect/:path(.*)',
@@ -184,37 +184,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       title: t('router.login'),
       noTagsView: true
     }
-  },{
-    path: '/forgetPassword',
-    component: () => import('@/views/login/forgetPassword.vue'),
-    name: 'ForgetPassword',
-    meta: {
-      hidden: true,
-      title: t('router.login'),
-      noTagsView: true
-    }
-  },
-  {
-    path: '/updatePassword',
-    component: () => import('@/views/login/updatePassword.vue'),
-    name: 'UpdatePassword',
-    meta: {
-      hidden: true,
-      title: t('router.login'),
-      noTagsView: true
-    }
   },
-  {
-    path: '/updatePasswordNewTips',
-    component: () => import('@/views/login/updatePasswordNewTips.vue'),
-    name: 'UpdatePasswordNewTips',
-    meta: {
-      hidden: true,
-      title: t('router.login'),
-      noTagsView: true
-    }
-  },
-  
   {
     path: '/sso',
     component: () => import('@/views/login/login.vue'),
@@ -255,26 +225,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
-  {
-    path: '/purchasereceiptReport',
-    component: () => import('@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue'),
-    name: 'purchasereceiptReport',
-    meta: {
-      hidden: true,
-      title: t('ts.查看质检报告'),
-      noTagsView: true
-    }
-  },
-  {
-    path: '/supplierResume',
-    component: () => import('@/views/wms/purchasereceiptManage/supplierdeliver/supplierResume/index.vue'),
-    name: 'supplierResume',
-    meta: {
-      hidden: true,
-      title: t('ts.查看履历表'),
-      noTagsView: true
-    }
-  },
   {
     path: '/bpm',
     component: Layout,
diff --git a/src/types/descriptions.d.ts b/src/types/descriptions.d.ts
index 62810c7ef..aa45d6b70 100644
--- a/src/types/descriptions.d.ts
+++ b/src/types/descriptions.d.ts
@@ -12,4 +12,5 @@ export interface DescriptionsSchema {
   valueFilter?: function // 展示的过滤函数
   slotFilter?:boolean // 插槽自定义内容
   dictType?: string // add by 星语：支持 dict 字典数据
+  sortDetailDefault?: string | number
 }
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index b946ce79a..1fb2d8fee 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -262,6 +262,7 @@ export enum DICT_TYPE {
   COUNT_PLAN_STATUS = 'count_plan_status', // 盘点计划状态
   COUNT_DIMENSION = 'count_dimension', // 盘点维度
   REQUEST_STATUS = 'request_status', // 申请状态
+  DEMANDFORECASTING_STATUS = 'demandforecasting_status', // 申请状态
   UNPLANNED_RECEIPT_REASON = 'unplanned_receipt_reason', // 计划外入库原因
   UNPLANNED_ISSUE_REASON = 'unplanned_issue_reason', // 计划外出库原因
   SCRAP_REASON = 'scrap_reason', // 报废出库原因
diff --git a/src/utils/disposition/formFields.ts b/src/utils/disposition/formFields.ts
index 941ce69fa..b833e8918 100644
--- a/src/utils/disposition/formFields.ts
+++ b/src/utils/disposition/formFields.ts
@@ -2,10 +2,10 @@
  * @returns {Array}  基础物料信息
  */
  export const ItemBasic =  [
-    { label: "物料代码", prop: 'code' },
-    { label: "物料名称", prop: "name" },
-    { label: "描述1", prop: "desc1" },
-    { label: "描述2", prop: "desc2" },
+    { label: "品番", prop: 'code' },
+    { label: "品名", prop: "name" },
+    { label: "背番", prop: "desc1" },
+    { label: "描述", prop: "desc2" },
     { type: "filter", label: "状态", prop: "status", filters: "itemStatus" },
     { label: "计量单位", prop: 'basicUom' },
     { type: "filter", label: "ABC类", prop: 'abcClass', filters: "abcClass" },
@@ -36,7 +36,7 @@
  */
  export const ItemQuality =  [
     {  label: "itemCode", prop: "itemCode" },
-    { label: "物料名称", prop: 'name' },
+    { label: "品名", prop: 'name' },
     { label: "供应商代码", prop: 'supplierCode' },
     { type: "filter", label: "检验类型", prop: 'inspectType', filters: "inspectType" },
     { label: "检验周期-按到货频次", prop: 'inspFrequency' },
@@ -66,7 +66,7 @@
  export const ItemPack =  [
     { label: "包装代码", prop: 'packCode', },
     { label: "包装名称", prop: "packName" },
-    { label: '物料代码', prop: "itemCode", },
+    { label: '品番', prop: "itemCode", },
     { label: "是否标准包装", type: "filter", prop: 'isStdPack', filters: "whetherOrNot" },
     { label: '标包编号', prop: "stdPackCode", },
     { label: "包装数量",type: "object",  prop: "packQty", showProp: "qty" },
@@ -133,7 +133,7 @@
  export const CustomerItem =  [
     { label: "客户代码", prop: 'customerCode', },
     { label: "itemCode", prop: "itemCode", },
-    { label: "客户物料代码", prop: "customerItemCode", },
+    { label: "客户品番", prop: "customerItemCode", },
     { label: "版本", prop: "version", },
     { type: "objectDateTime", label: "开始时间", prop: "timeRange", showProp: "beginTime" },
     { type: "objectDateTime", label: "结束时间", prop: "timeRange", showProp: "endTime" },
@@ -194,8 +194,8 @@
  export const SupplierItem =  [
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "itemCode", prop: "itemCode" },
-  { label: "供应商物料代码", prop: "supplierItemCode" },
-  { label: "供应商物料名称", prop: "itemName" },
+  { label: "供应商品番", prop: "supplierItemCode" },
+  { label: "供应商品名", prop: "itemName" },
   { label: "每托数量", prop: "qtyPerPallet" },
   { type: "object", label: "包装数量", prop: "supplierPackQty", showProp: "qty" },
   { type: "object", label: "包装单位", prop: "supplierPackQty", showProp: "uom" },
@@ -377,7 +377,7 @@
  * @returns {Array}   物料安全库存
  */
  export const ItemSafetyStock = [
-  { label: "物料代码", prop: "itemCode", },
+  { label: "品番", prop: "itemCode", },
   { label: "仓库代码", prop: "warehouseCode" },
   { type: "filter", label: "存储关系类型", prop: "storeRelationType", filters: "storeRelationType", },
   { label: "值", prop: "storeValue" },
@@ -394,7 +394,7 @@
  */
  export const ItemSafetyStockQuery = [
   {
-    label: "物料代码",
+    label: "品番",
     prop: "itemCode",
     fixed: "left",
     type: "name",
@@ -436,7 +436,7 @@
  * @returns {Array}  生产线零件关系
  */
  export const ProdLineItem =  [
-  { label: "物料代码", prop: "itemCode", },
+  { label: "品番", prop: "itemCode", },
   { label: "生产线编号", prop: "prodLineCode", },
   { label: "生产线名称", prop: "prodLineName", },
   { label: "车间代码", prop: "workshopCode", },
@@ -924,9 +924,9 @@ export const DeliverNote = [
  */
  export const InventoryBalance = [
   { label: "itemCode", prop: 'itemCode' },
-  { type: "object", label: "物料名称", prop: "item", showProp: "name" },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { type: "object", label: "品名", prop: "item", showProp: "name" },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2" },
   { label: "库位代码", prop: "locationCode" },
   { type: "filter", label: "库存状态", prop: "status", filters: "inventoryStage" },
   { label: "批次", prop: 'lot' },
@@ -975,9 +975,9 @@ export const ERPInventoryBalance = [
   { label: "箱标签", prop: "packingCode" },
   { label: "托标签", prop: "containerCode" },
   { label: "itemCode", prop: "itemCode", },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "计量单位", prop: "qty", showProp: "uom" },
   { type: "filter", filters: "inventoryStage", label: "库存状态", prop: "inventoryStatus" },
   { label: "仓库代码", prop: "warehouseCode" },
@@ -1022,9 +1022,9 @@ export const ERPInventoryBalance = [
   { type: "filter", filters: "inventoryStage", label: "从状态", prop: "fromStatus", },
   { type: "filter", filters: "inventoryStage", label: "到状态", prop: "toStatus", },
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
   { label: "批次", prop: 'lot', },
@@ -1064,9 +1064,9 @@ export const InventoryTransferLogHegeZBuHeGe = [
   { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus", },
   { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus", },
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
   { label: "批次", prop: 'lot', },
@@ -1082,9 +1082,9 @@ export const InventoryTransferLogHegeZBuHeGe = [
  */
  export const InventoryOccupied = [
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { label: "任务编号", prop: "jobNumber" },
   { label: "箱标签", prop: "packingCode", },
   { label: "托标签", prop: "containerCode", },
@@ -1105,9 +1105,9 @@ export const InventoryTransferLogHegeZBuHeGe = [
  */
  export const InventoryPredictable = [
   { label: "itemCode", prop: "itemCode", },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { label: "任务编号", prop: "jobNumber" },
   { label: "箱标签", prop: "packingCode", },
   { label: "托标签", prop: "containerCode", },
@@ -1168,9 +1168,9 @@ export const InventoryTransferLogHegeZBuHeGe = [
   { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus", },
   { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus", },
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
   { label: "批次", prop: 'lot', },
@@ -1210,10 +1210,10 @@ export const InventoryTransferLogHegeZBuHeGe = [
  export const TracebackNote = [
   // { label: "编号", prop: "id", },
   { label: "追溯单号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name" },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { label: "品番", prop: "itemCode" },
+  { label: "品名", type: "object", prop: "item", showProp: "name" },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2" },
   { label: "箱标签", prop: "packingCode" },
   { type: "object", label: "产品数量", prop: "qty", showProp: "qty" },
   { type: "object", label: "单位", prop: "qty", showProp: "uom" },
@@ -1278,14 +1278,14 @@ export const ReworkNote =  [
     prop: "number",
     fixed: "left",
   },
-  { label: "物料代码", prop: 'itemCode' },
+  { label: "品番", prop: 'itemCode' },
   // { label: "部门", prop: 'department' },
   // { label: "工单号", prop: 'workOrder' },
   // { label: "流水号", prop: 'seqNo' },
-  { label: "目标物料代码", prop: 'toItemCode' },
-  { label: "目标物料名称", prop: 'toItemName' },
-  { label: "目标物料描述1", prop: 'toItemDesc1' },
-  { label: "目标物料描述2", prop: 'toItemDesc2' },
+  { label: "目标品番", prop: 'toItemCode' },
+  { label: "目标品名", prop: 'toItemName' },
+  { label: "目标背番", prop: 'toItemDesc1' },
+  { label: "目标描述", prop: 'toItemDesc2' },
   { label: "目标数量", prop: 'toQtyQty' },
   { label: "目标单位", prop: 'toQtyUom' },
   { label: "目标库位", prop: 'toLocationCode' },
@@ -1646,7 +1646,7 @@ export const OuterPillarDeliverNote = [
   { label: "项目号", prop: "projectCode" },
   { label: "位置", prop: 'position' },
   { label: "配置号", prop: 'l7Part' },
-  { label: "物料描述", prop: 'itemName' },
+  { label: "描述", prop: 'itemName' },
   { label: "备品生产号", prop: 'sparesNumber' },
   { label: "备品批次", prop: 'sparesLot' },
   { label: "目标生产号", prop: 'targetNumber' },
@@ -1727,8 +1727,8 @@ export const OuterPillarDeliverNote = [
   { label: "工厂", prop: 'site' },
   { label: "物料号", prop: 'code' },
   { label: "物流名称", prop: 'name' },
-  { label: "描述1", prop: 'desc1' },
-  { label: "描述2", prop: 'desc2' },
+  { label: "背番", prop: 'desc1' },
+  { label: "描述", prop: 'desc2' },
   { label: "物料状态", prop: 'status' },
   { label: "允许制造", prop: 'canMake' },
   { label: "允许采购", prop: 'canBuy' },
@@ -1933,10 +1933,10 @@ export const PillarDeliverNote = [
  */
 export const labelInfo =  [
   { label: "箱码", prop: "packingCode" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "item", showProp: 'name', type:'object' },
-  { label: "物料描述1", prop: "item", showProp: 'desc1', type:'object' },
-  { label: "物料描述2", prop: "item", showProp: 'desc2', type:'object' },
+  { label: "品番", prop: "itemCode" },
+  { label: "品名", prop: "item", showProp: 'name', type:'object' },
+  { label: "背番", prop: "item", showProp: 'desc1', type:'object' },
+  { label: "描述", prop: "item", showProp: 'desc2', type:'object' },
   { label: "批次", prop: "lot" },
   { label: "数量", prop: "qty", showProp: 'qty', type:'object' },
   { label: "单位", prop: "qty", showProp: 'uom', type:'object' },
diff --git a/src/utils/disposition/tableDetailsColumns.ts b/src/utils/disposition/tableDetailsColumns.ts
index 7db984905..a68e3aeb1 100644
--- a/src/utils/disposition/tableDetailsColumns.ts
+++ b/src/utils/disposition/tableDetailsColumns.ts
@@ -3,9 +3,9 @@
  */
  export const PurchaseOrder =  [
     { label: "itemCode", prop: "itemCode", fixed: "left" },
-    { type:"object", label: "物料名称", prop: "item", showProp:"name", },
-    { type:"object", label: "物料描述1", prop: "item", showProp:"desc1", },
-    { type:"object", label: "物料描述2", prop: "item", showProp:"desc2", },
+    { type:"object", label: "品名", prop: "item", showProp:"name", },
+    { type:"object", label: "背番", prop: "item", showProp:"desc1", },
+    { type:"object", label: "描述", prop: "item", showProp:"desc2", },
     { label: "订单号", prop: "number", },
     { label: "订单行", prop: "poLine", },
     { type:"object", label: "数量", prop: "qty", showProp:"qty", },
@@ -23,9 +23,9 @@
       { label: "销售订单号", prop: "number", fixed: "left",},
       { label: "订单行", prop: "soLine", },
       { label: "itemCode", prop: "itemCode", },
-      { type:"object", label: "物料名称", prop: "item", showProp:"name", },
-      { type:"object", label: "物料描述1", prop: "item", showProp:"desc1", },
-      { type:"object", label: "物料描述2", prop: "item", showProp:"desc2", },
+      { type:"object", label: "品名", prop: "item", showProp:"name", },
+      { type:"object", label: "背番", prop: "item", showProp:"desc1", },
+      { type:"object", label: "描述", prop: "item", showProp:"desc2", },
       { label: "备注", prop: 'remark', },
   ]
 /**
@@ -36,9 +36,9 @@
     { label: "订单行", prop: "poLine", width: "200px" },
     { label: "箱标签", prop: "packingCode", width: "200px" },
     { label: "itemCode", prop: "itemCode", width: "200px" },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "200px" },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "200px" },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "200px" },
+    { type: "object", label: "品名", prop: "item", showProp: "name", width: "200px" },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", width: "200px" },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", width: "200px" },
     // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", width: "200px" },
     { type: "object", label: "发货数量", prop: "qty", showProp: "qty", width: "200px" },
     { type: "object", label: "计量单位", prop: "qty", showProp: "uom", width: "200px" },
@@ -58,9 +58,9 @@
     { label: "订单行", prop: "poLine", },
     { label: "箱标签", prop: "packingCode", },
     { label: "itemCode", prop: "itemCode", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
     { type: "object", label: "计量单位", prop: "qty", showProp: "uom", },
     { label: "托标签", prop: "containerCode", },
@@ -75,13 +75,13 @@
  */
  export const ArriveNotice =  [
     { label: "itemCode", prop: "itemCode",fixed:"left", },
-    { type: "object", label: "物料名称",  prop: "item", showProp: "name", },
+    { type: "object", label: "品名",  prop: "item", showProp: "name", },
     { type: "object", valueType: Number, label: "到货数量",  prop: "qty", showProp: "qty", },
     { type: "object", valueType: Number, label: "包装数量",  prop: "stdPack", showProp: "packQty", },
     { label: "每托数量",  prop: "qtyPerPallet", },
     { type: "object", label: "计量单位", prop: "qty", showProp: "uom", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { label: "批次", prop: "lot", },
     { type: "objectDateTime", label: "生产日期",  prop: "batch", showProp: "produceDate", },
     { type: "object", label: "供应商批次",  prop: "batch", showProp: "supplierBatch", },
@@ -96,7 +96,7 @@
  */
  export const PurchaseReceiptNote =  [
       { label: "itemCode", prop: "itemCode",fixed: "left", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
@@ -105,8 +105,8 @@
       { label: "箱标签", prop: "packingCode", },
       { label: "托标签", prop: "containerCode", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
       { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
       { label: "E-LEVEL等级", prop: "labelEqLevel" },
@@ -117,13 +117,13 @@
  */
  export const ReceiptAbnormalNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
       { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
       { label: "备注", prop: 'remark', },
@@ -133,9 +133,9 @@
  */
  export const PurchaseReturnNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "箱标签", prop: "packingCode"},
       { label: "退货库位", prop: "locationCode"},
       { label: "发货单号", prop: "asnNumber" },
@@ -155,14 +155,14 @@
       { label: "箱标签", prop: "toPackingCode", },
       { type: "object", valueType: Number, label: "上架数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { type: "object", label: "备料单位", prop: "qty", showProp: "uom", },
       { label: "目标库位", prop: "toLocationCode", },
       { label: "来源库位", prop: "fromLocationCode", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
       { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "备注", prop: 'remark', },
   ]
 /**
@@ -177,9 +177,9 @@
     { label: "请求库位", prop: "requestLocationCode", },
     { label: "目标库位", prop: "toLocationCode",  },
     { type: "dateTime", label: "过期日期", prop: "expiredTime", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { label: "备注", prop: 'remark', },
   ]
 /**
@@ -190,15 +190,15 @@
       // { label: "箱标签", type: "input", prop: "packingCode", },
       { type: "object", valueType: Number, label: "发料数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { type: "object", label: "发料单位", prop: "qty", showProp: "uom", },
       { label: "请求库位", prop: "fromRequestLocationCode", },
       { label: "目标库位", prop: "toLocationCode", },
       { label: "来源库位", prop: "fromLocationCode", },
       { type: "dateTime", label: "发料时间", prop: "issueTime", },
       { type: "dateTime", label: "过期时间", prop: "expiredTime", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "生产线", prop: "prodLine", },
       { label: "工作中心", prop: "workCenter", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
@@ -213,13 +213,13 @@
       // { label: "箱标签", type: "input", prop: "packingCode", },
       { type: "object", valueType: Number, label: "入库数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { type: "object", label: "入库单位", prop: "qty", showProp: "uom", },
       { label: "库位编号", prop: "locationCode", },
       { label: "箱标签", prop: "packingCode", },
       { label: "托标签", prop: "containerCode", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
       { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
       { label: "供应商代码", prop: 'supplierCode', },
@@ -234,13 +234,13 @@
     // { label: "箱标签", type: "input", prop: "packingCode", },
     { type: "object", valueType: Number, label: "出库数量", prop: "qty", showProp: "qty", },
     { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
     { type: "object", label: "出库单位", prop: "qty", showProp: "uom", },
     { label: "库位编号", prop: "locationCode", },
     { label: "箱标签", prop: "packingCode", },
     { label: "托标签", prop: "containerCode", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
     { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
     { label: "供应商代码", prop: 'supplierCode', },
@@ -255,7 +255,7 @@
     // { label: "箱标签", type: "input", prop: "packingCode", },
     { type: "object", valueType: Number, label: "隔离数量", prop: "qty", showProp: "qty", },
     { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
     { type: "object", label: "隔离单位", prop: "qty", showProp: "uom", },
     { label: "来源库位", prop: "fromLocationCode", },
     { label: "目标库位", prop: "toLocationCode", },
@@ -263,8 +263,8 @@
     { label: "目标箱标签", prop: "toPackingCode", },
     { label: "来源托标签", prop: "fromContainerCode", },
     { label: "来源托标签", prop: "toContainerCode", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
     { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
     { label: "备注", prop: 'remark', },
@@ -277,7 +277,7 @@
     // { label: "箱标签", type: "input", prop: "packingCode", },
     { type: "object", valueType: Number, label: "报废数量", prop: "qty", showProp: "qty", },
     { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
     { type: "object", label: "报废单位", prop: "qty", showProp: "uom", },
     { label: "来源库位", prop: "fromLocationCode", },
     { label: "目标库位", prop: "toLocationCode", },
@@ -285,8 +285,8 @@
     { label: "目标箱标签", prop: "toPackingCode", },
     { label: "来源托标签", prop: "fromContainerCode", },
     { label: "来源托标签", prop: "toContainerCode", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
     { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
     { label: "备注", prop: 'remark', },
@@ -296,14 +296,14 @@
  */
  export const DeliverPlan =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
       { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "项目", prop: "project", },
       { label: "销售订单号", prop: "soNumber", },
       { label: "订单行", prop: "soLine", },
@@ -316,11 +316,11 @@
       { label: "itemCode", prop: "itemCode", fixed: "left",},
       { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { label: "目标库位", prop: "toLocationCode", },
       { type: "dateTime", label: "过期时间", prop: "expiredTime", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "备注", prop: 'remark', },
   ]
 /**
@@ -331,7 +331,7 @@
       // { label: "箱标签", type: "input", prop: "packingCode", },
       { type: "object", valueType: Number, label: "发货数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { type: "object", label: "发货单位", prop: "qty", showProp: "uom", },
       { label: "目标库位", prop: "toLocationCode", },
       { label: "来源库位", prop: "fromLocationCode", },
@@ -343,8 +343,8 @@
       { label: "目标托标签", prop: "toContainerCode", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
       { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "备注", prop: 'remark', },
   ]
 /**
@@ -373,9 +373,9 @@
     { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
     // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
     { label: "批次", prop: "lot", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { label: "备注", prop: 'remark', },
   ]
 
@@ -386,9 +386,9 @@
   { label: "盘点计划单号", prop: "countPlanNumber", fixed: "left", },
   // { type: "filter", filters: "stageType", label: "阶段", prop: "stage",},
   { label: "itemCode", prop: "itemCode", },
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { label: "盘点数量", prop: "finalCountQty" },
   { label: "盘点差异数量", prop: "diffQty" },
   { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", },
@@ -416,9 +416,9 @@
       { label: "盘点计划单号", prop: "countPlanNumber", fixed: "left", },
       // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage",},
       { label: "itemCode", prop: "itemCode", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "盘点数量", prop: "finalCountQty" },
       { label: "盘点差异数量", prop: "diffQty" },
       { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", },
@@ -444,11 +444,11 @@
  export const CountAdjustNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left", },
       // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage",},
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "300px" },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "300px" },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", width: "300px" },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", width: "300px" },
       { label: "库位编号", prop: "locationCode", width: "200px" },
       // { type: "object", valueType: Number, label: "发货数量", prop: "InventoryQty", showProp: "qty", width: "100px" },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "150px" },
+      { type: "object", label: "品名", prop: "item", showProp: "name", width: "150px" },
       // { type: "object", label: "发货单位", prop: "InventoryQty", showProp: "uom", width: "100px" },
       { label: "盘点差异数量", prop: "diffQty" },
       // { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", width: "100px" },
@@ -468,9 +468,9 @@
  */
  export const ProductionPlan =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name",},
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name",},
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "计划数量", prop: "planQty", showProp: "qty", },
       // { label: "合格数量", prop: "goodQty", },
       // { label: "不合格数量", prop: "noGoodQty", },
@@ -486,9 +486,9 @@
  */
  export const PreparationPlan =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "备料数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "备料单位", prop: "qty", showProp: "uom", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "qty", },
@@ -503,9 +503,9 @@
  */
  export const ProductReceiptNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "150px" },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "300px" },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "300px" },
+      { type: "object", label: "品名", prop: "item", showProp: "name", width: "150px" },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", width: "300px" },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", width: "300px" },
       { label: "库位编号", prop: "locationCode", },
       { label: "原料库位", prop: "rawLocation", width: "100px" },
       { type: "object", valueType: Number, label: "完工收货数量", prop: "qty", showProp: "qty", width: "100px" },
@@ -526,9 +526,9 @@
  */
  export const OfflineSettlementNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name",},
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name",},
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "下线结算数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "下线结算单位", prop: "qty", showProp: "uom", },
       { label: "库位编号", prop: "locationCode", },
@@ -544,9 +544,9 @@
  */
  export const TracebackNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name",},
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name",},
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "消耗数量", prop: "rawQty", showProp: "qty", },
       { type: "object", label: "包装规格", prop: "rawQty", showProp: "uom", },
       { label: "来源库位代码", prop: "rawLocation", },
@@ -562,9 +562,9 @@
  */
  export const ProductRecycleNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "库位编号", prop: "locationCode", },
       { label: "原料库位编号", prop: "rawLocation", },
       { type: "object", valueType: Number, label: "成品回收数量", prop: "qty", showProp: "qty", },
@@ -584,9 +584,9 @@
  */
  export const StockReturnNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "退库数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "退库单位", prop: "qty", showProp: "uom", },
@@ -607,9 +607,9 @@
  */
  export const CustomerReturnNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "退货数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "退货单位", prop: "qty", showProp: "uom", },
@@ -628,9 +628,9 @@
  */
  export const WareHouseTransferNote =  [
   { label: "物料编号", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "目标库位", prop: "toLocationCode", },
@@ -647,10 +647,10 @@
  */
   export const ReworkNote =  [
     { label: "工单号", prop: "number", fixed: "left" },
-    { label: "物料代码", prop: 'itemCode' },
-    { label: "物料名称", prop: 'item', showProp: 'name', type: "object" },
-    { label: "描述1", prop: 'item', showProp: 'desc1', type: "object" },
-    { label: "描述1", prop: 'item', showProp: 'desc1', type: "object" },
+    { label: "品番", prop: 'itemCode' },
+    { label: "品名", prop: 'item', showProp: 'name', type: "object" },
+    { label: "背番", prop: 'item', showProp: 'desc1', type: "object" },
+    { label: "背番", prop: 'item', showProp: 'desc1', type: "object" },
     { label: "批次", prop: 'lot' },
     { label: "箱标签", prop: 'packingCode' },
     { label: "单位", prop: 'qty', showProp: 'uom', type: "object" },
@@ -668,9 +668,9 @@
  */
  export const InspectNotice =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "箱标签", prop: "packingCode",},
       { label: "托标签", prop: "containerCode",},
       { label: "批次", prop: "lot" },
@@ -692,9 +692,9 @@
  */
  export const InspectNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "检验数量", prop: "inspectQty",},
       { label: "合格数量", prop: "goodQty",},
       { label: "不合格数量", prop: "failedQty",},
@@ -718,9 +718,9 @@
  */
  export const InspectAbnormalNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "质量异常数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "质量异常单位", prop: "qty", showProp: "uom", },
@@ -736,9 +736,9 @@
  */
  export const PurchaseReceiptJob =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "实际收货数量", prop: "handledQty", showProp: "qty", },
       { type: "object", label: "推荐收货数量", prop: "recommendQty", showProp: "qty", },
       { type: "object", label: "收货单位", prop: "recommendQty", showProp: "uom",},
@@ -773,9 +773,9 @@
       { label: "推荐库位", prop: "recommendLocationCode",},
       { label: "实际托标签", prop: "handledContainerCode",},
       { label: "推荐托标签", prop: "recommendContainerCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
       { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
       { type: "object", label: "实际供应商批次", prop: "handledBatch", showProp: "supplierBatch",},
@@ -789,9 +789,9 @@
  */
  export const PutawayJob =  [
       { label: "itemCode", prop: "itemCode",  fixed: "left",}, 
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "实际箱标签", prop: "handledPackingCode",},
       { label: "推荐箱标签", prop: "recommendPackingCode",},
       { label: "实际托标签", prop: "handledContainerCode",},
@@ -819,9 +819,9 @@
  */
  export const InspectJob =  [
       { label: "itemCode", prop: "itemCode",  fixed:"left", }, 
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "实际箱标签",prop: "handledPackingCode",},
       { label: "推荐箱标签", prop: "recommendPackingCode",},
       { label: "实际托标签", prop: "handledContainerCode",},
@@ -855,9 +855,9 @@
  */
  export const IssueJob =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "实际箱标签", prop: "handledPackingCode",},
       { label: "推荐箱标签", prop: "recommendPackingCode",},
       { label: "请求库位", prop: "fromRequestLocationCode", },
@@ -895,9 +895,9 @@
       { label: "目标库位", prop: "toLocation",},
       { label: "推荐库位", prop: "recommendLocationCode",},
       { label: "托标签", prop: "containerCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
       // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
@@ -922,9 +922,9 @@
       { type: "object", label: "收货单位", prop: "handledQty", showProp: "uom",},
       // { label: "箱标签", prop: "packingCode",},
       { label: "托标签", prop: "containerCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
       // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
@@ -952,9 +952,9 @@
       { type: "object", label: "推荐批次", prop: "recommendBatch", showProp: "supplierBatch", },
       { type: "object", label: "推荐日期", prop: "recommendBatch", showProp: "produceDate",},
       { label: "托标签", prop: "containerCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
       // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
@@ -971,9 +971,9 @@
       { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom",},
       { label: "实际库位", prop: "locationCode",},
       { label: "托标签", prop: "containerCode",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
       { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
@@ -996,10 +996,10 @@
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
       { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
       { label: "托标签", prop: "containerCode",},
-      //{ label: "物料代码", prop: "itemCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      //{ label: "品番", prop: "itemCode",},
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
       { label: "批次", prop: "lot", },
       { label: "备注", prop: 'remark', },
@@ -1069,9 +1069,9 @@ export const ReceivingRecords = [
  */
  export const JisProductRecycleNote = [
   { label: "itemCode", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "箱标签", prop: "packingCode"},
@@ -1090,9 +1090,9 @@ export const ReceivingRecords = [
  */
  export const JisProductReturnNote = [
   { label: "itemCode", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   // { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "产品号", prop: "productNo" },
@@ -1104,9 +1104,9 @@ export const ReceivingRecords = [
  */
  export const JisProductTransferNote = [
   { label: "itemCode", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   { label: "批次", prop: "lot" },
   { label: "产品号", prop: "productNo" },
@@ -1132,9 +1132,9 @@ export const ReceivingRecords = [
  * @returns {Array}  JIS信息查询
  */
  export const JISMessageQuery = [
-  { label: "物料代码", prop: "itemCode", },
-  { label: "物料名称",type: "object",  prop: "item", showProp: "name" },
-  { label: "物料描述",type: "object", prop: "item", showProp: "desc1" },
+  { label: "品番", prop: "itemCode", },
+  { label: "品名",type: "object",  prop: "item", showProp: "name" },
+  { label: "描述",type: "object", prop: "item", showProp: "desc1" },
   { label: "产品号", prop: "productNo" },
   { label: "项目号", prop: 'program' },
   { label: "位置", prop: 'position' },
@@ -1150,13 +1150,13 @@ export const ReceivingRecords = [
  */
  export const OuterJisDeliverNote = [
   { label: "单据号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
+  { label: "品番", prop: "itemCode" },
   { label: "发货单号", prop: 'deliverNumber' },
   { label: "生产号", prop: 'productionNumber' },
   { label: "REV", prop: 'rev' },
   { label: "配置号", prop: 'l7Part' },
   { label: "流水号", prop: 'serialNumber' },
-  { label: "物料描述", prop: 'itemName' },
+  { label: "描述", prop: 'itemName' },
   { label: "位置", prop: 'position' },
   { label: "数量", prop: 'qty' },
   { label: "站别名", prop: 'siteNickName' },
@@ -1179,14 +1179,14 @@ export const ReceivingRecords = [
  */
 export const OuterPillarDeliverNote = [
   { label: "单据号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
+  { label: "品番", prop: "itemCode" },
   { label: "发货单号", prop: 'deliverNumber' },
   // { label: "生产号", prop: 'productionNumber' },
   // { label: "REV", prop: 'rev' },
   // { label: "配置号", prop: 'l7Part' },
   // { label: "流水号", prop: 'serialNumber' },
-  { label: "物料描述1", prop: 'item', showProp:'desc1', type: "object" },
-  { label: "物料描述2", prop: 'item', showProp:'desc2', type: "object" },
+  { label: "背番", prop: 'item', showProp:'desc1', type: "object" },
+  { label: "描述", prop: 'item', showProp:'desc2', type: "object" },
   { label: "来源库位", prop: 'locationCode' },
   { label: "发货数量", prop: 'qty', showProp: 'qty', type: 'object' },
   // { label: "位置", prop: 'position' },
@@ -1211,8 +1211,8 @@ export const OuterPillarDeliverNote = [
  */
  export const OuterJisUnplannedReceiptNote = [
   { label: "单据号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料描述", prop: 'itemName' },
+  { label: "品番", prop: "itemCode" },
+  { label: "描述", prop: 'itemName' },
   { label: "计划外入库单号", prop: 'outerUnplannedReceiptNumber' },
   { label: "单据类型", prop: 'documentType' },
   { label: "生产号", prop: 'productionNumber' },
@@ -1234,8 +1234,8 @@ export const OuterPillarDeliverNote = [
  */
  export const OuterJisUnplannedIssueNote = [
   { label: "单据号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料描述", prop: 'itemName' },
+  { label: "品番", prop: "itemCode" },
+  { label: "描述", prop: 'itemName' },
   { label: "计划外出库单号", prop: 'outerUnplannedIssueNumber' },
   { label: "单据类型", prop: 'documentType' },
   { label: "生产号", prop: 'productionNumber' },
@@ -1255,9 +1255,9 @@ export const OuterPillarDeliverNote = [
  */
 export const SingleDoorPanelDeliverNote =  [
   { label: "itemCode", prop: "itemCode", fixed: "left" },
-  { type: "object", label: "物料名称", prop: "item", showProp: "name" },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { type: "object", label: "品名", prop: "item", showProp: "name" },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2" },
   { label: "目标批次", prop: "toLot" },
   { label: "来源批次", prop: "fromLot" },
   { label: "来源箱标签", prop: "fromPackingCode" },
@@ -1290,9 +1290,9 @@ export const SingleDoorPanelDeliverNote =  [
  */
 export const SingleDoorPanelProductReceiptNote =  [
   { label: "itemCode", prop: "itemCode", fixed: "left" },
-  { type: "object", label: "物料名称", prop: "item", showProp: "name" },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { type: "object", label: "品名", prop: "item", showProp: "name" },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2" },
   { label: "批次", prop: "lot" },
   { label: "箱标签", prop: "packingCode" },
   { label: "托标签", prop: "containerCode" },
@@ -1318,7 +1318,7 @@ export const SingleDoorPanelProductReceiptNote =  [
  */
 export const SingleDoorPanelProductAdjust =  [
   { label: "完工调整单号", prop: "number" },
-  { label: "物料代码", prop: 'itemCode',},
+  { label: "品番", prop: 'itemCode',},
   { label: "批次", prop: 'lot',},
   { label: "箱标签", prop: 'packingCode',},
   { label: "托标签", prop: 'containerCode',},
@@ -1335,9 +1335,9 @@ export const SingleDoorPanelProductAdjust =  [
  */
   export const SingleDoorPanelProductTransferNote =  [
     { label: "物料编号", prop: "itemCode", fixed: "left" },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name" },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+    { type: "object", label: "品名", prop: "item", showProp: "name" },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2" },
     { label: "批次", prop: "lot" },
     { label: "箱标签", prop: "packingCode" },
     { label: "托标签", prop: "containerCode" },
@@ -1358,7 +1358,7 @@ export const SingleDoorPanelProductAdjust =  [
  */
 export const SingleDoorPanelCustomerReturnNote =  [
   { label: "客户退货单号", prop: "number" },
-  { label: "物料代码", prop: 'itemCode' },
+  { label: "品番", prop: 'itemCode' },
   { label: "批次", prop: 'lot' },
   { label: "箱标签", prop: 'packingCode' },
   { label: "托标签", prop: 'containerCode' },
@@ -1380,9 +1380,9 @@ export const SingleDoorPanelCustomerReturnNote =  [
  */
  export const PillarDeliverNote =  [
   { label: "物料编号", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "目标批次", prop: "toLot", },
@@ -1414,9 +1414,9 @@ export const InventoryTransferNote = [
   { type: "filter", filters: "inventoryStage", label: "从状态", prop: "fromStatus", },
   { type: "filter", filters: "inventoryStage", label: "到状态", prop: "toStatus", },
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
   { label: "从批次", prop: "fromLot" },
diff --git a/src/utils/disposition/tableSummaryColumns.ts b/src/utils/disposition/tableSummaryColumns.ts
index 98d55dc91..0047f92d0 100644
--- a/src/utils/disposition/tableSummaryColumns.ts
+++ b/src/utils/disposition/tableSummaryColumns.ts
@@ -3,9 +3,9 @@
  */
  export const InspectJob =  [
       { label: "itemCode", prop: "itemCode",  fixed:"left", }, 
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",},
       { label: "检验数量", prop: "inspectQty",},
       { label: "合格数量", prop: "goodQty",},
@@ -28,9 +28,9 @@
       // { label: "最终不合格数量", prop: "notPassedQty",},
       // { label: "实际库位", prop: "handledLocationCode",},
       // { label: "推荐库位", prop: "recommendLocationCode",},
-      // { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      // { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      // { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      // { label: "品名", type: "object", prop: "item", showProp: "name", },
+      // { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      // { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
       // { label: "备注", prop: 'remark', },
 ]
@@ -40,9 +40,9 @@
  */
  export const InspectNotice =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "批次", prop: "lot" },
       { label: "抽检百分比", prop: "samplePercent",},
       { label: "检验数量", prop: "inspectQty",},
@@ -62,9 +62,9 @@
  */
  export const InspectNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "检验数量", prop: "inspectQty",},
       { label: "合格数量", prop: "goodQty",},
       { label: "不合格数量", prop: "failedQty",},
@@ -82,9 +82,9 @@
  */
   export const PurchaseReceiptNote =  [
      { label: "itemCode", prop: "itemCode",fixed: "left", },
-     { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-     { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-     { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+     { type: "object", label: "品名", prop: "item", showProp: "name", },
+     { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+     { type: "object", label: "描述", prop: "item", showProp: "desc2", },
      { label: "总数", prop: "summary" },
      { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
diff --git a/src/utils/validator.ts b/src/utils/validator.ts
index d0c78aa4c..d857e0c02 100644
--- a/src/utils/validator.ts
+++ b/src/utils/validator.ts
@@ -376,6 +376,16 @@ export function validateMaxNumber5(rule, value, callback) {
     }
 
 }
+
+export function validateMaxInteger(rule, value, callback) {
+  if (parseInt(value) >= 0 && parseInt(value) <= 65535) {
+    callback()
+  } else {
+    callback(new Error('请输入正确整数'))
+  }
+
+}
+
 // 数字格式  小数点后三位
 export function validateThreeNum(rule, value, callback) {
     if (value) {
diff --git a/src/views/eam/applicationRecord/applicationRecordMain.data.ts b/src/views/eam/applicationRecord/applicationRecordMain.data.ts
index f36966a98..4c75b18e7 100644
--- a/src/views/eam/applicationRecord/applicationRecordMain.data.ts
+++ b/src/views/eam/applicationRecord/applicationRecordMain.data.ts
@@ -321,7 +321,7 @@ export const ApplicationRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物品代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/eam/toolMod/toolMod.data.ts b/src/views/eam/toolMod/toolMod.data.ts
index 77e4a638b..b4fecad3d 100644
--- a/src/views/eam/toolMod/toolMod.data.ts
+++ b/src/views/eam/toolMod/toolMod.data.ts
@@ -89,7 +89,7 @@ export const ToolMod = useCrudSchemas(reactive<CrudSchema[]>([
   //   form: {
   //     componentProps: {
   //       isSearchList: true,
-  //       searchListPlaceholder: '请选择物料代码',
+  //       searchListPlaceholder: '请选择品番',
   //       searchField: 'modCodeShow',
   //       searchTitle: '客户物料基础信息',
   //       multiple:true,
@@ -105,7 +105,7 @@ export const ToolMod = useCrudSchemas(reactive<CrudSchema[]>([
   //   search: {
   //     componentProps: {
   //       isSearchList: true,
-  //       searchListPlaceholder: '请选择物料代码',
+  //       searchListPlaceholder: '请选择品番',
   //       searchField: 'modCodeShow',
   //       searchTitle: '客户物料基础信息',
   //       multiple: true,
diff --git a/src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue b/src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue
index 9fc7345e5..e1af17903 100644
--- a/src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue
+++ b/src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue
@@ -183,7 +183,7 @@
           <el-table-column prop="amount" :label="t('home.money')" width="120" />
           <el-table-column prop="itemCode" :label="t('home.material_code')" width="160" />
           <el-table-column prop="itemName" :label="t('home.material_name')" width="120" />
-          <el-table-column prop="itemDesc1" :label="t('home.material_description1')" width="120" />
+          <el-table-column prop="itemDesc1" :label="t('home.Material Abbreviation')" width="120" />
           <el-table-column prop="itemDesc2" :label="t('home.material_description2')" width="120" />
           <el-table-column prop="qty" :label="t('home.amount')" width="120" />
           <el-table-column prop="uom" :label="t('home.measuring_unit')" width="120">
diff --git a/src/views/infra/outerApiHis/index.vue b/src/views/infra/outerApiHis/index.vue
index d0b555db2..85317f561 100644
--- a/src/views/infra/outerApiHis/index.vue
+++ b/src/views/infra/outerApiHis/index.vue
@@ -128,7 +128,7 @@ const butttondata = (row) =>{
   return [
     // defaultButtons.mainListEditBtn({hasPermi:'wms:outerApiHis:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:outerApiHis:delete'}), // 删除
-    defaultButtons.retryBtn({hide: row.times >= 3 || row.success}), // 重试
+    defaultButtons.retryBtn({hide: row.success}), // 重试
   ]
 } 
 
diff --git a/src/views/mes/orderDay/components/orderDetail.vue b/src/views/mes/orderDay/components/orderDetail.vue
index 3e7b0e7ad..b2328a506 100644
--- a/src/views/mes/orderDay/components/orderDetail.vue
+++ b/src/views/mes/orderDay/components/orderDetail.vue
@@ -81,7 +81,7 @@
               style="width: 100%"
             >
             <el-table-column prop="id" label="序号" align="center" />
-            <el-table-column prop="srcMaterialCode" label="物料代码" align="center" />
+            <el-table-column prop="srcMaterialCode" label="品番" align="center" />
             <el-table-column prop="srcMaterialModel" label="计量单位" align="center" />
             <el-table-column prop="srcMaterialCounts" label="数量" align="center"/>
             <el-table-column prop="processCode" label="工序编码" align="center" />
diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue
index 1b6d72818..7aa377de6 100644
--- a/src/views/mes/processroute/components/configDialog.vue
+++ b/src/views/mes/processroute/components/configDialog.vue
@@ -108,7 +108,7 @@
               </div>
             </template>
             <el-table :data="showMaterialsData" ref="tableMaterial" style="width: 100%; height: 80%;overflow-y: auto;">
-                  <!-- <el-table-column prop="name" label="物料名称"/> -->
+                  <!-- <el-table-column prop="name" label="品名"/> -->
                   <el-table-column prop="componentItemCode" label="物料编码"/>
                   <el-table-column prop="version" label="版本号"/>
                   <el-table-column prop="componentQty" label="物料数量"/>
diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index 2dbdc478f..c65a7b66a 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -109,7 +109,7 @@ export const InspectionJobMain = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       isSearch: false,
diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
index 1faeb77f9..2b59ef60f 100644
--- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts
+++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
@@ -27,7 +27,7 @@ const validateNumber = (rule: any, value: any, callback: any) => {
 }  
 // 表单校验
 export const Q1Rules = reactive({
-  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
   customerCode: [{ required: true, message: '请选择客户代码', trigger: 'change' }],
   qty: [{ required: true, message: '请输入数量', trigger: 'change' },
     { validator:validateNumber, message: '数量必须是数值类型', trigger: 'change'}
@@ -57,7 +57,7 @@ export const Q1 = useCrudSchemas(
       }
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -69,7 +69,7 @@ export const Q1 = useCrudSchemas(
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'itemCode', // 查询弹窗赋值字段
           searchTitle: '客户物料信息', // 查询弹窗标题
           searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类
@@ -95,7 +95,7 @@ export const Q1 = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       dictClass: 'string',
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index acdb4c3f6..3a2f02894 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -69,7 +69,7 @@
   >
     <template #searchQuerypurchaseReceiptNumber>
       <el-form :inline="true">
-        <el-form-item label="供应商物料代码">
+        <el-form-item label="供应商品番">
           <el-input
             v-model="basicFormRef.formRef.formModel.itemCode"
             placeholder="请输入供应商"
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 1270b5928..070055d50 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -20,7 +20,7 @@ const userStore = useUserStore()
 
 // 表单校验
 export const Q2Rules = reactive({
-  itemCode: [{ required: true, message: '请选择供应商物料代码', trigger: 'change' }],
+  itemCode: [{ required: true, message: '请选择供应商品番', trigger: 'change' }],
   supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }],
   purchaseReceiptNumber: [
     // { required: true, message: '请选择采购收货单号', trigger: 'change' },
@@ -168,7 +168,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '供应商物料代码',
+      label: '供应商品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -180,7 +180,7 @@ export const Q2 = useCrudSchemas(
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'itemCode', // 查询弹窗赋值字段
           searchTitle: '供应商物料信息', // 查询弹窗标题
           searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
@@ -211,7 +211,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '供应商物料名称',
+      label: '供应商品名',
       field: 'itemName',
       sort: 'custom',
       dictClass: 'string',
@@ -329,7 +329,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '整灯/分总成物料代码',
+      label: '整灯/分总成品番',
       field: 'lightItemCode',
       sort: 'custom',
       table: {
@@ -341,7 +341,7 @@ export const Q2 = useCrudSchemas(
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择整灯/分总成物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择整灯/分总成品番', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -372,7 +372,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '整灯/分总成物料名称',
+      label: '整灯/分总成品名',
       field: 'lightItemName',
       sort: 'custom',
       dictClass: 'string',
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index 23d415a91..5b787d137 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -309,7 +309,7 @@ export const InspectionQ3Detail = useCrudSchemas(
       tableForm: {
         isInpuFocusShow: false,
         disabled: true,
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -341,7 +341,7 @@ export const InspectionQ3Detail = useCrudSchemas(
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -537,7 +537,7 @@ export const InspectionQ3Detail = useCrudSchemas(
 
 //表单校验
 export const InspectionQ3DetailRules = reactive({
-  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
   qty: [{ required: true, message: '请输入数量', trigger: 'change' }],
   price: [{ required: true, message: '请选择单价', trigger: 'change' }],
   amount: [{ required: true, message: '请选择金额', trigger: 'change' }],
diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
index 2952c93c1..c11d3457b 100644
--- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
@@ -111,7 +111,7 @@ export const InspectionRecordMain = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       isSearch: false,
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index b9c008bac..4a64ab108 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -47,12 +47,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料名称" prop="itemName">
+              <el-form-item label="品名" prop="itemName">
                 <el-input v-model="data.itemName" placeholder="请填写名称" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料描述" prop="desc1">
+              <el-form-item label="描述" prop="desc1">
                 <el-input v-model="data.desc1" placeholder="请填写描述" disabled />
               </el-form-item>
             </el-col>
diff --git a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
index 1d75b6b0d..9bf748cf4 100644
--- a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
+++ b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
@@ -47,7 +47,7 @@ export const InspectionRecordMain = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       isSearch: false,
diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
index 167cc34ff..8949f8a4b 100644
--- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
+++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
@@ -316,7 +316,7 @@ export const InspectionMain = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       isSearch: false,
diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
index e817d31bc..3341d5c70 100644
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -47,7 +47,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料名称" prop="itemName">
+              <el-form-item label="品名" prop="itemName">
                 <div style="display: flex; width: 100%">
                   <el-input v-model="data.itemName" placeholder="请选择物料" disabled />
                 </div>
diff --git a/src/views/qms/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
index 9d8f3e6ef..f4d0f297e 100644
--- a/src/views/qms/inspectionScheme/inspectionScheme.data.ts
+++ b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
@@ -54,7 +54,7 @@ export const InspectionSchemeMain = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
diff --git a/src/views/qms/qualityNotice/components/qualityBatch.vue b/src/views/qms/qualityNotice/components/qualityBatch.vue
index ce7799ee0..e22cdb3dc 100644
--- a/src/views/qms/qualityNotice/components/qualityBatch.vue
+++ b/src/views/qms/qualityNotice/components/qualityBatch.vue
@@ -28,8 +28,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料代码" prop="itemCode">
-                <el-input v-model="item.itemCode" placeholder="请输入物料代码" />
+              <el-form-item label="品番" prop="itemCode">
+                <el-input v-model="item.itemCode" placeholder="请输入品番" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -43,8 +43,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料描述" prop="itemDesc">
-                <el-input v-model="item.itemDesc" placeholder="请输入物料描述" />
+              <el-form-item label="描述" prop="itemDesc">
+                <el-input v-model="item.itemDesc" placeholder="请输入描述" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -119,7 +119,7 @@
           <el-table-column prop="defectTypeCodeGroup" label="缺陷类型代码组"  align="center" width="150"/>
           <el-table-column prop="defectTypeCode" label="缺陷类型代码"  align="center" width="150"/>
           <el-table-column prop="defectDesc" label="缺陷描述"  align="center" width="150"/>
-          <el-table-column prop="defectSonItemCode" label="缺陷子物料代码"  align="center" width="150"/>
+          <el-table-column prop="defectSonItemCode" label="缺陷子品番"  align="center" width="150"/>
           <el-table-column prop="defectCount" label="缺陷数量"  align="center" width="150"/>
           <el-table-column prop="defectLevel" label="缺陷级别"  align="center" width="150"/>
           <el-table-column prop="sampleNumber" label="样本编号"  align="center" width="150"/>
@@ -296,8 +296,8 @@
             </el-col>
  
             <el-col :span="12">
-              <el-form-item prop="defectSonItemCode" label="缺陷子物料代码" >
-                <el-input v-model="defectForm.defectSonItemCode"  placeholder="请输入缺陷子物料代码" />
+              <el-form-item prop="defectSonItemCode" label="缺陷子品番" >
+                <el-input v-model="defectForm.defectSonItemCode"  placeholder="请输入缺陷子品番" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/system/post/PostAreaPermissionForm.vue b/src/views/system/post/PostAreaPermissionForm.vue
index a8138d537..084eae557 100644
--- a/src/views/system/post/PostAreaPermissionForm.vue
+++ b/src/views/system/post/PostAreaPermissionForm.vue
@@ -73,7 +73,7 @@ const open = async (row: any) => {
   resetForm()
   // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点
   let array = await PostApi.getPostAreaTreeList()
-  array.forEach(item=>item.name =item.code + '-' + item.name )
+  array.forEach(item=>item.name =item.code + ' ' + item.name )
   areaOptions.value =  handleTree(array)
   // menuOptions.value =  await MenuApi.getSimpleMenusList())
   // 设置数据
diff --git a/src/views/system/post/PostForm.vue b/src/views/system/post/PostForm.vue
index 1894e0cb7..7931adf38 100644
--- a/src/views/system/post/PostForm.vue
+++ b/src/views/system/post/PostForm.vue
@@ -40,6 +40,12 @@
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as PostApi from '@/api/system/post'
+import {
+  validateInteger,
+  validateMaxInteger,
+  validateMaxNumber5,
+  validatePositiveNumber
+} from "@/utils/validator";
 
 defineOptions({ name: 'SystemPostForm' })
 
@@ -59,10 +65,20 @@ const formData = ref({
   remark: ''
 })
 const formRules = reactive({
-  name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }],
-  code: [{ required: true, message: '岗位编码不能为空', trigger: 'change' }],
+  name: [
+    { required: true, message: '岗位标题不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  code: [
+    { required: true, message: '岗位编码不能为空', trigger: 'change' },
+    { max: 64, message: '不得超过64个字符', trigger: 'blur' }
+  ],
   status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
-  remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
+  remark: [
+    { required: false, message: '岗位内容不能为空', trigger: 'blur' },
+    { max: 500, message: '不得超过500个字符', trigger: 'blur' }
+  ],
+  sort:[{ validator:validateMaxInteger, message: '岗位顺序范围0~65535', trigger: 'change'}]
 })
 const formRef = ref() // 表单 Ref
 
diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
index 14b82105e..96d7be2ed 100644
--- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
+++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
@@ -19,13 +19,13 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '父物品代码',
+    label: '父品番',
     field: 'parentItemCode',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '物品代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/wms/basicDataManage/customerManage/customer/index.vue b/src/views/wms/basicDataManage/customerManage/customer/index.vue
index 99931fae0..23e6dc927 100644
--- a/src/views/wms/basicDataManage/customerManage/customer/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customer/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
index 39689c7a3..478e13d55 100644
--- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
index d5fae481d..2b60e8e49 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
index d72f9dbc7..8e591e7d3 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
@@ -54,7 +54,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -65,7 +65,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -89,7 +89,23 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '客户物料代码',
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '客户品番',
     field: 'customerItemCode',
     sort: 'custom',
     table: {
@@ -352,7 +368,7 @@ export const CustomeritemRules = reactive({
     { required: true, message: '请输入客户代码', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   packUnit: [
     { required: true, message: '请选择客户包装单位', trigger: 'change' }
@@ -368,7 +384,7 @@ export const CustomeritemRules = reactive({
   ],
   customerItemCode: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validate: validateYS, message: '请输入正确的客户物料代码', trigger: 'blur' }
+    { validate: validateYS, message: '请输入正确的客户品番', trigger: 'blur' }
   ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
index 9cdb2c851..06068794e 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue
index 9acfffa27..383c476b9 100644
--- a/src/views/wms/basicDataManage/customerManage/project/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/project/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
index 1d22026fe..983f7bcf0 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
index 3c13320b2..22cef3981 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
@@ -50,7 +50,7 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -62,7 +62,7 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '客户物料信息', // 查询弹窗标题
         searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类
@@ -88,6 +88,22 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '货币',
     field: 'currency',
@@ -271,7 +287,7 @@ export const SalepriceRules = reactive({
     { required: true, message: '请输入客户代码', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   currency: [
     { required: true, message: '请选择货币', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
index 2607dfb9e..ed6634899 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
index d6c1d0d28..acbd73aca 100644
--- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
index 6818d5e66..2c6d8c869 100644
--- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
index 80f505ba0..e540b4a2c 100644
--- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
index 4835f48cd..daf2e8b05 100644
--- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
index 1a870feeb..b5d282b2b 100644
--- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
index 9085a6238..677298f35 100644
--- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
index 2db81a820..33d87e0d2 100644
--- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
index 531ead548..0a6270e46 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
index 99fd42e3b..85734f579 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -237,7 +237,7 @@ const openForm = (type: string, row?: any) => {
 const onEnter = async (field,value)=>{
   console.log('onEnter',field,value)
   if('defaultLocationCode'==field){
-    //物料代码
+    //品番
     basicFormRef.value.opensearchTable('itemCode', 'code', '库位信息', Location.allSchemas, LocationApi.getLocationPage,[{
       key: 'available',
       value: 'TRUE',
diff --git a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
index 057d48313..5ab359f21 100644
--- a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
index 664be1170..e73dffa17 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
index 1366d6bab..56f96e4b4 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
index 23f6304b9..d666e96aa 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
index c20790388..f3ad30ae8 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
index 32af2cdf2..e25bd0986 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
index 55c1e18af..373bd5d8c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index b5506d157..c5e13b718 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index 4d9eee3a4..dbe258708 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -14,7 +14,7 @@ const { t } = useI18n() // 国际化
 */
 export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '父物料代码',
+    label: '父品番',
     field: 'productItemCode',
     isSearch: true,
     sort: 'custom',
@@ -27,7 +27,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -44,7 +44,22 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '子物料代码',
+    label: '父背番',
+    field: 'productBackNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '子品番',
     field: 'componentItemCode',
     isSearch: true,
     sort: 'custom',
@@ -56,7 +71,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -72,6 +87,21 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '子背番',
+    field: 'componentBackNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '子物料计量单位',
     field: 'componentUom',
@@ -305,10 +335,10 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const BomRules = reactive({
   productItemCode: [
-    { required: true, message: '请输入父物料代码', trigger: 'change' }
+    { required: true, message: '请输入父品番', trigger: 'change' }
   ],
   componentItemCode: [
-    { required: true, message: '请输入子物料代码', trigger: 'change' }
+    { required: true, message: '请输入子品番', trigger: 'change' }
   ],
   componentUom: [
     { required: true, message: '请选择子物料计量单位', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue
index 7cca4e859..c9676e05d 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue
@@ -28,12 +28,12 @@
       v-model:sort="tableObject.sort"
     >
       <template #productItemCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '物料代码', row.productItemCode)">
+        <el-button type="primary" link @click="openDetail(row, '品番', row.productItemCode)">
           <span>{{ row.productItemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -231,7 +231,7 @@ const formsSuccess = async (formType,data) => {
       if(data.activeTime==0)data.activeTime = null;
       if(data.expireTime==0)data.expireTime = null;
       if (data.productItemCode == data.componentItemCode) {
-          message.error('父物料代码和子物料代码不能相同！')
+          message.error('父品番和子品番不能相同！')
           return
       }
       basicFormRef.value.formLoading = true
diff --git a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue
index fdb7a3aa2..036a6359c 100644
--- a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -95,6 +95,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     } else {
       setV[formField] = val[0][searchField]
     }
+    setV['itemDesc1'] = val[0]['backNumber']//背番赋值到背番
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts
index cb338d498..44c905544 100644
--- a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts
@@ -38,7 +38,7 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -48,7 +48,7 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive<CrudSchema[]>([
         multiple: true,
         enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -71,12 +71,28 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isSearch: false,
     isForm:false,
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: false,
+    isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '生效时间',
     field: 'effectiveDate',
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 8e5cd1eb4..5d365906c 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -178,6 +178,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }else{
         setV[formField] = setV[0][searchField]
       }
+      setV['itemDesc1'] = val[0]['backNumber']//背番赋值到背番
       formRef.setValues(setV)
     }
   })
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index 939b782bd..8215bc3c2 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -16,7 +16,7 @@ import { t } from '@/hooks/web/useI18n'
 
 export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -29,7 +29,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -50,6 +50,21 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '区域代码',
     field: 'areaCode',
@@ -158,7 +173,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         }, {
           key: 'itemCode',
           value: 'itemCode',
-          message: "请选择物料代码",
+          message: "请选择品番",
           isMainValue: true
         }],
         verificationParams: [{
@@ -169,7 +184,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           isSearch: true,
           isFormModel: true,
           required: true,
-          message: '请选择物料代码',
+          message: '请选择品番',
         }], // 失去焦点校验参数
       }
     }
@@ -198,7 +213,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         }, {
           key: 'itemCode',
           value: 'itemCode',
-          message: "请选择物料代码",
+          message: "请选择品番",
           isMainValue: true
         }],
         verificationParams: [{
@@ -209,7 +224,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           isSearch: true,
           isFormModel: true,
           required: true,
-          message: '请选择物料代码',
+          message: '请选择品番',
           isBlurParams: true,//是否是失去焦点的方法的参数
         }], // 失去焦点校验参数
       }
@@ -324,7 +339,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           isSearch: true,
           isFormModel: true,
           required: true,
-          message: '请选择物料代码',
+          message: '请选择品番',
         }], // 失去焦点校验参数
       }
     }
@@ -727,7 +742,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
 // 表单校验
 export const ItemareaRules = reactive({
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   areaCode: [
     { required: true, message: '请选择到区域代码', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
index 078117066..48b279f97 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
@@ -27,7 +27,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row)"
           @button-base-click="buttonTableClick($event,row)"
         />
@@ -379,7 +379,7 @@ const changeTabs = (item) => {
   })
   }
  
-  // 当前物料代码作为条件
+  // 当前品番作为条件
   tableObjectExtend.value = [{
     key: 'itemCode',
     value: itemCodeRow.value
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index ad2840351..4a99f9e11 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -49,22 +49,22 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'backNumber',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     },
   },
+  // {
+  //   label: '背番',
+  //   field: 'desc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   } ,
+  //   // isTableForm:false
+  // },
   {
-    label: '描述1',
-    field: 'desc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    } ,
-    // isTableForm:false
-  },
-  {
-    label: '描述2',
+    label: '描述',
     field: 'desc2',
     sort: 'custom',
     table: {
@@ -245,7 +245,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '项目',
+    label: '车型',
     field: 'project',
     sort: 'custom',
     table: {
@@ -352,6 +352,24 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  {
+    label: 'ERP默认收货库位',
+    field: 'defaultErpLocationCode',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
+  {
+    label: '文档号',
+    field: 'itemGroup',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
   {
     label: '创建者',
     field: 'creator',
@@ -522,9 +540,6 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
 
-
-
-
   {
     label: '产品类',
     field: 'prodCla',
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 358c4d3ef..5a3bd32c6 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -33,12 +33,12 @@
       rowKey="id"
     >
       <template #itemCode="{ row }">
-        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+        <el-button type="primary" link @click="openDetail(row, '品番', row.itemCode)">
           <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -319,7 +319,7 @@ const formsSuccess = async (formType, data) => {
 const onEnter = async (field,value)=>{
   console.log('onEnter',field,value)
   if('itemCode'==field){
-    //物料代码
+    //品番
     basicFormRef.value.opensearchTable('itemCode', 'code', '物料基础信息', Itembasic.allSchemas, ItembasicApi.getItembasicPage,[{
       key: 'available',
       value: 'TRUE',
@@ -359,6 +359,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     if('itemCode'==formField){
       setV['itemName'] = val[0]['name']
       setV['uom'] = val[0]['uom']
+      setV['backNumber'] = val[0]['backNumber']
     }
     if('packUnit'==formField){
       setV['packType'] = val[0]['type']
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index e9004c76c..6d45ae27f 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -4,6 +4,7 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '../itembasic/itembasic.data'
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { Packageunit } from '../packageunit/packageunit.data'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 const { t } = useI18n() // 国际化
 
@@ -12,7 +13,7 @@ const { t } = useI18n() // 国际化
  */
 export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -25,7 +26,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -47,7 +48,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isSearch: false,
@@ -64,6 +65,21 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:true,
     isDetail:true
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    hiddenSearchHigh:true,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -356,7 +372,7 @@ const validateQty = (rule: any, value: any, callback: any,a,b) => {
 }  
 // 表单校验
 export const ItempackagingRules = reactive({
-  itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
+  itemCode: [{ required: true, message: '品番不能为空', trigger: 'change' }],
   uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
   packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
   packQty: [
@@ -365,3 +381,236 @@ export const ItempackagingRules = reactive({
   ],
   available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
 })
+/**
+ * @returns {Array} 采购件标签需要基础包装信息
+ */
+export const PurchasePackaging = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    
+  },
+  {
+    label: '看板编号',
+    field: 'lookNumber',
+    sort: 'custom',
+  },
+  {
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
+  },
+  {
+    label: '品名',
+    field: 'itemName',
+    sort: 'custom',
+  },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+  },
+  {
+    label: '描述',
+    field: 'itemDesc2',
+    sort: 'custom',
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
+  {
+    label: '有效期(日)',
+    field: 'validityDays',
+    sort: 'custom',
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '采购计量单位',
+    field: 'purchaseUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '采购数量',
+    field: 'purchaseQty',
+    sort: 'custom',
+  },
+  {
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
+    sort: 'custom',
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true, //可输入回车
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '供应商品番',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '标签数量',
+    field: 'count',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'aaa',
+    sort: 'custom',
+  },
+ 
+]))
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
index 608621e1d..e3e02af26 100644
--- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
index 97a56f508..55acd0468 100644
--- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
@@ -9,7 +9,7 @@ import { Itempackaging } from '../itempackage/itempackage.data'
 
 export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -21,7 +21,7 @@ export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -115,7 +115,7 @@ export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'itemCode',
           value: 'itemCode',
-          message: "请选择物料代码",
+          message: "请选择品番",
           isMainValue: true
         }]
       }
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
index 78500a628..65f00a549 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase  :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore  :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
index a7c8168e6..4c68724e1 100644
--- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
index d27f49652..8941de485 100644
--- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
@@ -21,7 +21,7 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive<CrudSchem
       componentProps: {
         enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -60,7 +60,7 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive<CrudSchem
       componentProps: {
         enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
index 5314a421e..9e44cf8a2 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -257,6 +257,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    setV['itemDesc1'] = val[0]['backNumber']
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
index e0e5f7198..8a8c169b3 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -100,7 +100,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch: true,
     sort: 'custom',
@@ -112,7 +112,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'code',
         searchTitle: '物料信息',
         searchAllSchemas: Itembasic.allSchemas,
@@ -151,6 +151,21 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '是否可用',
     field: 'available',
@@ -298,7 +313,7 @@ export const ProductionlineitemRules = reactive({
     { required: true, message: '请输入产线代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -307,3 +322,163 @@ export const ProductionlineitemRules = reactive({
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
 })
+
+/**
+ * @returns {Array} 生产线物料关系加上物料基本信息
+ */
+export const ProductionlineitemInfo = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '产线代码',
+    field: 'productionLineCode',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isForm: true,
+    form: {
+      show: true,
+      component: 'SelectV2',
+      // value:'undefined',
+      value: lineCodeData?.list.length > 0 ? lineCodeData.list[0].code : 'undefined',
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        // isSearchList: true,
+        filterable: true,
+        placeholder: '请选择产线代码',
+        searchField: 'code',
+        // searchTitle: '生产线信息',
+        // searchAllSchemas: Productionline.allSchemas,
+        // searchPage: ProductionLineCodeApi.getProductionlinePage
+        options: lineCodeData.list.map(item => ({
+          label: item.code,
+          value: item.code
+        }))
+      }
+    },
+  },
+  {
+    label: '品番',
+    field: 'itemCode',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择品番',
+        searchField: 'code',
+        searchTitle: '物料信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
+        searchCondition: [
+          {
+            key: 'enableMake',
+            value: 'TRUE',
+            action: '==',
+            isSearch: true,
+            isMainValue: false
+          },
+          {
+            key: 'type',
+            value: confgiData.itemType,
+            action: 'notin',
+            isSearch: true,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            action: '==',
+            isSearch: true,
+            isMainValue: false
+          }
+        ]
+      }
+    }
+  },
+  {
+    label: '品名',
+    field: 'itemCode',
+  },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '车型',
+    field: 'vehicleType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: true
+  },
+ 
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
index a5895cc41..c3af76121 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
@@ -154,7 +154,7 @@ export const RelegateRecordDetailRules = reactive({
 
 export const RelegateRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -162,7 +162,7 @@ export const RelegateRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '降级后物料代码',
+    label: '降级后品番',
     field: 'downItemCode',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 4e1b6747a..b9d696daa 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -205,7 +205,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             itemCodes.push(item['itemCode'])
           }
         })
-        console.log('过滤之后的物料代码',itemCodes)
+        console.log('过滤之后的品番',itemCodes)
         itemCodes.forEach(async (item)=>{
           let res = await ProductionitemcodeSpareitemcodeApi.getProductionitemcodeSpareitemcodeRelation({
             changeBeforeCode:item,
@@ -576,7 +576,7 @@ const buttonTableClick = async (val, row) => {
           })
           }
         } else {
-          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          message.warning('没有查询到品番：【' + item.itemCode + '】')
           return
         }
       })
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index c30c7ae9e..69ec190f4 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -317,13 +317,13 @@ export const RelegateRequestDetailRules = reactive({
 
 export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     form: {
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: BalancePopWindow.allSchemas,
@@ -335,7 +335,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled:true,
       multiple:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -365,7 +365,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'productionItemCode',
         searchTitle: '物料基础信息',
         searchAllSchemas: Itembasic.allSchemas,
@@ -392,7 +392,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'productionItemCode', // 查询弹窗赋值字段
       searchTitle: '物料基础信息', // 查询弹窗标题
       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -704,7 +704,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
  */
 export const RelegateRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'downItemCode',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
index d1035afbe..4e7b36011 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
@@ -28,12 +28,12 @@
       v-model:sort="tableObject.sort"
     >
       <template #itemCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+        <el-button type="primary" link @click="openDetail(row, '品番', row.itemCode)">
           <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -245,6 +245,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    setV['itemDesc1'] = val[0]['backNumber']
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
index 0c1184e0e..62b656ccf 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
@@ -42,7 +42,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
   //   }
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch: true,
     sort: 'custom',
@@ -55,7 +55,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -82,6 +82,21 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '货币',
     field: 'currency',
@@ -253,7 +268,7 @@ export const StdcostpriceRules = reactive({
     { required: true, message: '请输入供应商代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
   currency: [
     { required: true, message: '请选择货币', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
index 139231a87..ad001b090 100644
--- a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue
index 0228c7de1..aa099d59a 100644
--- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index f1399603c..ffc74f318 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -43,7 +43,7 @@ export const CallmaterialsRules = reactive({
 
 export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -56,7 +56,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -102,7 +102,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
           }],
         verificationParams: [{
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index d698ae13b..923bb7977 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
index 11b4ad08b..607c7ab09 100644
--- a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
index daa86d07c..04a8228b2 100644
--- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts
index 54145b1d0..533068257 100644
--- a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts
@@ -61,55 +61,55 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       width: 380,
     }
   },
-  {
-    label: '打印次数',
-    field: 'printTimes',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0
-      },
-      value: 0
-    },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印时间',
-    field: 'lastPrintTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印人ID',
-    field: 'lastPrintUserId',
-    sort: 'custom',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印人用户名',
-    field: 'lastPrintUserName',
-    sort: 'custom',
-    table: {
-      width: 170,
-    }
-  },
+  // {
+  //   label: '打印次数',
+  //   field: 'printTimes',
+  //   sort: 'custom',
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 0
+  //     },
+  //     value: 0
+  //   },
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '最后打印时间',
+  //   field: 'lastPrintTime',
+  //   sort: 'custom',
+  //   formatter: dateFormatter,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '最后打印人ID',
+  //   field: 'lastPrintUserId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '最后打印人用户名',
+  //   field: 'lastPrintUserName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 170,
+  //   }
+  // },
   {
     label: '是否可用',
     field: 'available',
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
index 9a5326394..651457153 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -66,7 +66,7 @@ import * as BarbasicApi from '@/api/wms/barbasic'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
-import * as Itempackaging from '@/api/wms/itempackage'
+import * as itembasicApi from '@/api/wms/itembasic'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -110,17 +110,21 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
         setV['produceDate'] = ''
         setV['expireDate'] = ''
         setV['validityDays'] = val[0]['validityDays']
-        await Itempackaging.getItempackagingPage({
-          itemCode: val[0]['code']
+        await itembasicApi.getItembasicPage({
+          code: val[0]['code']
         }).then(res => {
           if (res) {
             if (res.list.length > 0) {
-              setV['packQty'] = res.list[0].packQty
-              setV['packUnit'] = res.list[0].packUnit
+              setV['packQty'] = res.list[0].defaultPackQty
+              setV['packUnit'] = res.list[0].defaultPackUnit
             }
           }
         })
       }
+      if(formField == 'packUnit') {
+        setV['packUnit'] = val[0].packUnit
+        setV['packQty'] = val[0].packQty
+      }
       basicFormRef.setValues(setV)
   })
 }
@@ -152,9 +156,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  defaultButtons.defaultAddBtn(null), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -319,29 +323,34 @@ const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAcces
 // }
 const labelType = ref('') // 标签类别 采购还是制造等
 const handlePoint = async (row) => {
-  console.log(row.packingNumber,445555555555555);
-  PackageApi.getBalanceToPackage(row.relateNumber).then(res => {
-    console.log(777,res);
-    if (res.productionLineCode != null) {
-      labelType.value = 'zz'
-    } else {
-      labelType.value = 'cg'
-    }
-    PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
-      console.log(159,resLable )
-      // 判断是采购还是制造
-      if (labelType.value == 'cg') {
-        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-        console.log(159,resLable )
-        window.open(src.value+'&asn_number='+resLable)
+  console.log(row.packingNumber, 445555555555555);
+  tableObject.loading = true
+  try {
+    await PackageApi.getBalanceToPackage(row.relateNumber).then( async res => {
+      console.log(777,res);
+      if (res.productionLineCode != null) {
+        labelType.value = 'zz'
       } else {
-        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-        window.open(src.value+'&asn_number='+resLable)
-      }
+        labelType.value = 'cg'
+        }
+      await PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+        console.log(159,resLable )
+        // 判断是采购还是制造
+        if (labelType.value == 'cg') {
+          const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+          console.log(159,resLable )
+          window.open(src.value+'&asn_number='+resLable)
+        } else {
+          const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+          window.open(src.value+'&asn_number='+resLable)
+        }
+      })
+    }).catch(err => {
+      console.log(err)
     })
-  }).catch(err => {
-    console.log(err)
-  })
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 // form表单提交
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
index dd51b272c..1d58b27ee 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
@@ -1,656 +1,721 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
-import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
-import * as ItembasicApi from "@/api/wms/itembasic";
-import { Productionline } from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
-import * as ProductionlineApi from "@/api/wms/productionline";
-import { Shift } from "@/views/wms/basicDataManage/orderManage/shift/shift.data";
-import * as ShiftApi from "@/api/wms/shift";
-import { Team } from "@/views/wms/basicDataManage/orderManage/team/team.data";
-import * as TeamApi from "@/api/wms/team";
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import * as ShiftApi from '@/api/wms/shift'
+import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import * as TeamApi from '@/api/wms/team'
+
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 
 // 表单校验
 export const PackageRules = reactive({
   number: [required],
   itemCode: [required],
-  itemName: [required],
+  itemName: [required]
 })
 
-export const Package = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '标签号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      fixed: 'left',
-      width:210
-    }
-  },
-  {
-    label: '标签类型',
-    field: 'type',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.LABEL_TYPE,
-    dictClass: 'string',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '标签模板',
-    field: 'template',
-    sort: 'custom',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '标签状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: true,
-    dictType: DICT_TYPE.LABEL_STATUS,
-    dictClass: 'string',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '关联号',
-    field: 'relateNumber',
-    sort: 'custom',
-    isSearch:true,
-    table: {
-      width: 210
-    }
-  },
-  {
-    label: '标签条码字符串',
-    field: 'barcodeString',
-    sort: 'custom',
-    table: {
-      width: 380,
-    }
-  },
-  {
-    label: '打印次数',
-    field: 'printTimes',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0
-      },
-      value: 0
+export const Package = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '标签号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        fixed: 'left',
+        width: 210
+      }
     },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印时间',
-    field: 'lastPrintTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '标签类型',
+      field: 'type',
+      sort: 'custom',
+      isSearch: false,
+      dictType: DICT_TYPE.LABEL_TYPE,
+      dictClass: 'string',
+      table: {
+        width: 180
       }
     },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印人ID',
-    field: 'lastPrintUserId',
-    sort: 'custom',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印人用户名',
-    field: 'lastPrintUserName',
-    sort: 'custom',
-    table: {
-      width: 180,
-    }
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    isSearch:true,
-    isForm: false,
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    search: {
-      value: 'TRUE',
+    {
+      label: '标签模板',
+      field: 'template',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 180
+      }
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '标签状态',
+      field: 'status',
+      sort: 'custom',
+      isTable: false,
+      isSearch: true,
+      dictType: DICT_TYPE.LABEL_STATUS,
+      dictClass: 'string',
+      table: {
+        width: 180
       }
     },
-    table: {
-      width: 110
-    }
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    isForm: false,
-    table: {
-      width: 180
+    {
+      label: '关联号',
+      field: 'relateNumber',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 210
+      }
     },
-    formatter: dateFormatter,
-    detail: {
-      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '标签条码字符串',
+      field: 'barcodeString',
+      sort: 'custom',
+      table: {
+        width: 380
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    // {
+    //   label: '打印次数',
+    //   field: 'printTimes',
+    //   sort: 'custom',
+    //   form: {
+    //     component: 'InputNumber',
+    //     componentProps: {
+    //       min: 0
+    //     },
+    //     value: 0
+    //   },
+    //   table: {
+    //     width: 180
+    //   }
+    // },
+    // {
+    //   label: '最后打印时间',
+    //   field: 'lastPrintTime',
+    //   sort: 'custom',
+    //   formatter: dateFormatter,
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       style: {width:'100%'},
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x',
+    //     }
+    //   },
+    //   table: {
+    //     width: 180
+    //   }
+    // },
+    // {
+    //   label: '最后打印人ID',
+    //   field: 'lastPrintUserId',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   }
+    // },
+    // {
+    //   label: '最后打印人用户名',
+    //   field: 'lastPrintUserName',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180,
+    //   }
+    // },
+    {
+      label: '是否可用',
+      field: 'available',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      search: {
+        value: 'TRUE'
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      },
+      table: {
+        width: 110
       }
-    }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    table: {
-      width: 130
     },
-    isForm: false,
-    isTable: true
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    isDetail: true,
-    isForm: false,
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    table: {
-      width: 180
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      isForm: false,
+      isTable: true
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      sort: 'custom',
+      isDetail: true,
+      isForm: false,
+      isTable: true,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '最后更新者',
+      field: 'updater',
+      isDetail: true,
+      isForm: false,
+      isTable: true,
+      table: {
+        width: 150
       }
-    }
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    isDetail: true,
-    isForm: false,
-    isTable: true,
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))
-
-export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150,
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
-        searchField: 'code',
-        searchTitle: '物料信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }, {
-          key: 'enableMake',
-            value: 'TRUE',
-            isMainValue: false
-          }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isForm:false
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isForm:false
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isForm:false
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150,
-    },
-  },
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150,
-  //   },
-  // },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    sort: 'custom',
-    formatter: dateFormatter2,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
+  ])
+)
+
+export const PackageInventory = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '品番',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择品番',
+          searchField: 'code',
+          searchTitle: '物料信息',
+          searchAllSchemas: Itembasic.allSchemas,
+          searchPage: ItembasicApi.getItembasicPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'enableMake',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '品名',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '描述',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 150
       }
     },
-    table: {
-      width: 180,
-    },
-  },
-  {
-    label: '有效期(日)',
-    field: 'validityDays',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 0,
-        disabled: true
+    // {
+    //   label: '替代批次',
+    //   field: 'altBatch',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150,
+    //   },
+    // },
+    {
+      label: '生产日期',
+      field: 'produceDate',
+      sort: 'custom',
+      formatter: dateFormatter2,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          valueFormat: 'YYYY-MM-DD',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
       },
-      value: 0
-    },
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '失效日期',
-    field: 'expireDate',
-    sort: 'custom',
-    formatter: dateFormatter,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
-        disabled: true
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      },
+      table: {
+        width: 180
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-        disabled: true
+    {
+      label: '有效期(日)',
+      field: 'validityDays',
+      sort: 'custom',
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 0,
+          disabled: true
+        },
+        value: 0
+      },
+      table: {
+        width: 150
       }
     },
-    table: {
-      width: 180,
-    },
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Select'
-    },
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
+    {
+      label: '失效日期',
+      field: 'expireDate',
+      sort: 'custom',
+      formatter: dateFormatter,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
+          disabled: true
+        }
       },
-      value: 0
-    },
-  },
-  {
-    label: '替代计量单位',
-    field: 'altUom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Select'
-    },
-    table: {
-      width: 150,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x',
+          disabled: true
+        }
+      },
+      table: {
+        width: 180
+      }
     },
-  },
-  {
-    label: '替代数量',
-    field: 'altQty',
-    sort: 'custom',
-    table: {
-      width: 150,
+    {
+      label: '计量单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Select'
+      },
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
       },
-      value: 0
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6
+        },
+        value: 0
+      }
     },
-  },
-  {
-    label: '转换率',
-    field: 'convertRate',
-    sort: 'custom',
-    table: {
-      width: 150,
+    {
+      label: '替代计量单位',
+      field: 'altUom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      form: {
+        component: 'Select'
+      },
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150,
+    {
+      label: '替代数量',
+      field: 'altQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6
+        },
+        value: 0
+      }
     },
-    form: {
-      componentProps:{
-        disabled: true
+    {
+      label: '转换率',
+      field: 'convertRate',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    table: {
-      width: 150,
+
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 120
+      },
+      isTable: false,
+      isTableForm: false,
+      isForm: true,
+      tableForm: {
+        enterSearch: true,
+        isInpuFocusShow: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'packUnit', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请先选择品番！',
+            isMainValue: true
+          }
+        ],
+        verificationParams: [
+          {
+            key: 'packUnit',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+          searchField: 'packUnit', // 查询弹窗赋值字段
+          searchTitle: '物料包装信息', // 查询弹窗标题
+          searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+          searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'itemCode',
+              value: 'itemCode',
+              message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'packUnit',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
     },
-    form: {
-      component: 'Select',
-      componentProps:{
-        disabled: true
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-    tableForm: {
-      disabled: true
-    }
-  },
-  // {
-  //   label: '生产订单号',
-  //   field: 'woNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150,
-  //   },
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true,
-  //       searchListPlaceholder: '请选择物料代码',
-  //       searchField: 'code',
-  //       searchTitle: '物料信息',
-  //       searchAllSchemas: Itembasic.allSchemas,
-  //       searchPage: ItembasicApi.getItembasicPage,
-  //       searchCondition: [{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       }]
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '生产订单行',
-  //   field: 'woLine',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150,
-  //   },
-  // },
-  {
-    label: '生产线代码',
-    field: 'productionLineCodePackage',
-    sort: 'custom',
-    table: {
-      width: 150,
+    // {
+    //   label: '生产订单号',
+    //   field: 'woNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150,
+    //   },
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       isSearchList: true,
+    //       searchListPlaceholder: '请选择品番',
+    //       searchField: 'code',
+    //       searchTitle: '物料信息',
+    //       searchAllSchemas: Itembasic.allSchemas,
+    //       searchPage: ItembasicApi.getItembasicPage,
+    //       searchCondition: [{
+    //         key: 'available',
+    //         value: 'TRUE',
+    //         isMainValue: false
+    //       }]
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '生产订单行',
+    //   field: 'woLine',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150,
+    //   },
+    // },
+    {
+      label: '生产线代码',
+      field: 'productionLineCodePackage',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择生产线代码',
+          searchField: 'code',
+          searchTitle: '生产线信息',
+          searchAllSchemas: Productionline.allSchemas,
+          searchPage: ProductionlineApi.getProductionlinePage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择生产线代码',
-        searchField: 'code',
-        searchTitle: '生产线信息',
-        searchAllSchemas: Productionline.allSchemas,
-        searchPage: ProductionlineApi.getProductionlinePage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '班组代码',
+      field: 'teamCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择生产线代码',
+          searchField: 'code',
+          searchTitle: '生产线信息',
+          searchAllSchemas: Team.allSchemas,
+          searchPage: TeamApi.getTeamPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '班组代码',
-    field: 'teamCode',
-    sort: 'custom',
-    table: {
-      width: 150,
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择生产线代码',
-        searchField: 'code',
-        searchTitle: '生产线信息',
-        searchAllSchemas: Team.allSchemas,
-        searchPage: TeamApi.getTeamPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '班次代码',
+      field: 'shiftCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择生产线代码',
+          searchField: 'code',
+          searchTitle: '生产线信息',
+          searchAllSchemas: Shift.allSchemas,
+          searchPage: ShiftApi.getShiftPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '班次代码',
-    field: 'shiftCode',
-    sort: 'custom',
-    table: {
-      width: 150,
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择生产线代码',
-        searchField: 'code',
-        searchTitle: '生产线信息',
-        searchAllSchemas: Shift.allSchemas,
-        searchPage: ShiftApi.getShiftPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))
+  ])
+)
 
 //表单校验
 export const PackageRulesInventor = reactive({
-  itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
-  ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
-  produceDate: [
-    { required: true, message: '请选择生产日期', trigger: 'change' }
-  ],
-  validityDays: [
-    { required: true, message: '请输入有效期(日)', trigger: 'blur' }
-  ],
-  expireDate: [
-    { required: true, message: '请选择失效日期', trigger: 'change' }
-  ],
-  uom: [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
-  ],
-  qty: [
-    { required: true, message: '请输入数量', trigger: 'blur' }
-  ],
-  woNumber: [
-    { required: true, message: '请选择生产订单号', trigger: 'change' }
-  ],
-  woLine: [
-    { required: true, message: '请选择生产订单行', trigger: 'change' }
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
+  batch: [{ required: true, message: '请输入批次', trigger: 'blur' }],
+  produceDate: [{ required: true, message: '请选择生产日期', trigger: 'change' }],
+  validityDays: [{ required: true, message: '请输入有效期(日)', trigger: 'blur' }],
+  expireDate: [{ required: true, message: '请选择失效日期', trigger: 'change' }],
+  uom: [{ required: true, message: '请选择计量单位', trigger: 'change' }],
+  qty: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+  woNumber: [{ required: true, message: '请选择生产订单号', trigger: 'change' }],
+  woLine: [{ required: true, message: '请选择生产订单行', trigger: 'change' }],
+  productionLineCodePackage: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
   ],
-  productionLineCodePackage: [
-    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: ['change','blur'] }
   ],
 })
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index 317fadb1f..f8b1cbf6d 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -48,10 +48,23 @@
     :apiCreate="PackageApi.createPackageLabel"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onChange="onChange"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="detailAllSchemas"
+    :tabs="[{
+      label: '包装明细',
+      prop: 'PackDetail'
+    },{
+      label: '明细',
+      prop: 'Detail'
+    }]"
+    :isHaveDetailTabs="false"
+    @changeTabs="changeTabs"
+    :detailDataProps=" detailDataProps"
+  />
+
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -63,6 +76,7 @@ import download from '@/utils/download'
 import { getAccessToken } from '@/utils/auth'
 import { Package,PackageRules,PackageInventory,PackageRulesInventor  } from './purchasePackage.data'
 import * as BarbasicApi from '@/api/wms/barbasic'
+import {PurchasePackaging} from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
@@ -71,6 +85,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import {getProductionlineitemPage} from "@/api/wms/productionlineitem";
+import Decimal from "decimal.js"  // 具体文件中引入
 const { loadStart, loadDone } = usePageLoading()
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
@@ -82,6 +97,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(Package.allSchemas.tableColumns)
+const detailAllSchemas = ref(PurchasePackaging.allSchemas)
 
 
 /**
@@ -107,6 +123,7 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
         setV['itemName'] = val[0]['name']
         setV['itemDesc1'] = val[0]['desc1']
         setV['itemDesc2'] = val[0]['desc2']
+        setV['itemType'] = val[0]['type']
         setV['uom'] = val[0]['uom']
         setV['backNumber'] = val[0]['backNumber']
         setV['colorCode'] = val[0]['colorCode']
@@ -135,6 +152,17 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
       }
     if (formField == 'asnNumber') {
       setV['purchaseOrderRemarks'] = val[0]['remark']
+      setV['poNumber'] = val[0]['poNumber']
+      setV['poLine'] = val[0]['poLine']
+      setV['purchaseStdQty'] = val[0]['supplierQty']
+      setV['purchaseUom'] = val[0]['supplierUom']
+      setV['convertRate'] = val[0]['convertRate']
+     if (val[0]['convertRate']==0 || val[0]['convertRate'] == 1) {
+         setV['purchaseQty'] =basicFormRef.formModel.qty
+      } else {
+        setV['purchaseQty'] = parseFloat(Decimal(basicFormRef.formModel.qty).div(Decimal(parseFloat(val[0]['convertRate']))).toNumber().toFixed(5))
+      }
+     
       PackageInventory.allSchemas.formSchema.forEach(item =>{
         if(item.value == ''){
           if(item.field == 'purchaseOrderRemarks'){
@@ -184,9 +212,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  defaultButtons.defaultAddBtn(null), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -265,7 +293,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   } else if (val == 'point') { // 标签打印
-    handleDocumentPrint(row.id)
+    handleDocumentPrint(row)
   } else if (val == 'enable') {
     handleEnable(row.id)
   } else if (val == 'disable') {
@@ -307,8 +335,14 @@ const openForm = (type: string, row?: number) => {
 
 /** 详情操作 */
 const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,"labelBarbasic")
+const detailData = ref()
+const openDetail =async (row: any, titleName: any, titleValue: any) => {
+  detailData.value = row
+  //打开默认获取包装信息
+  await PackageApi.getPackageByBarbasic(detailData.value.relateNumber).then((res) => {
+      detailDataProps.value = res
+    })
+  detailRef.value.openDetail(detailDataProps.value, titleName, titleValue,"labelBarbasic")
 }
 
 /** 删除按钮操作 */
@@ -344,8 +378,13 @@ const handleExport = async () => {
 
 const BASE_URL = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken())
-const handleDocumentPrint = async (id) => {
-  window.open(documentSrc.value + '&id=' + id)
+const handleDocumentPrint = async (row) => {
+   if (row.itemType == 'TOOL') {
+       documentSrc.value =BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()//采购标签协定品模板
+    } else {
+      documentSrc.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()//采购标签模板
+  } 
+  window.open(documentSrc.value + '&id=' + row.id)
 }
 
 
@@ -358,11 +397,9 @@ const handlePoint = async (row) => {
       labelType.value = 'cg'
     }
     PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
-      console.log(159,resLable )
       // 判断是采购还是制造
       if (labelType.value == 'cg') {
         const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-        console.log(159,resLable )
         window.open(src.value+'&asn_number='+resLable)
       } else {
         const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
@@ -423,6 +460,31 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
+const detailDataProps = ref({})
+const changeTabs = async (item) => {
+  if (item.prop == 'PackDetail') {
+    nextTick(async () => {
+     detailAllSchemas.value = PurchasePackaging.allSchemas
+    await PackageApi.getPackageByBarbasic(detailData.value.relateNumber).then((res) => {
+      detailDataProps.value = res
+    })
+   })
+  } else if(item.prop == 'Detail'){
+   nextTick(async()=>{
+    detailAllSchemas.value = Package.allSchemas
+    detailDataProps.value = detailData.value
+    })
+  }
+}
+const onChange = (field, cur) => {
+  if (field == 'qty') {
+    if (basicFormRef.value.formRef.formModel.convertRate==0 || basicFormRef.value.formRef.formModel.convertRate == 1) {
+        basicFormRef.value.formRef.formModel['purchaseQty'] =basicFormRef.value.formRef.formModel.qty
+    } else {
+      basicFormRef.value.formRef.formModel['purchaseQty'] = parseFloat(Decimal(basicFormRef.value.formRef.formModel.qty).div(Decimal(parseFloat(basicFormRef.value.formRef.formModel.convertRate))).toNumber().toFixed(5))
+    }
+  }
+}
 
 /** 初始化 **/
 onMounted(async () => {
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
index 1baff2838..d23d163ce 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+import { cloneDeep } from 'lodash-es'
 
 import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as ItembasicApi from "@/api/wms/itembasic";
@@ -7,21 +8,31 @@ import { Dock } from "@/views/wms/basicDataManage/factoryModeling/dock/dock.data
 import * as DockApi from "@/api/wms/dock";
 import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
 import * as SupplierApi from "@/api/wms/supplier";
-import { SupplierdeliverRecordMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data";
-import * as SupplierdeliverRecordMainApi from "@/api/wms/supplierdeliverRecordMain";
+import { SupplierdeliverRecordMain, SupplierdeliverRecordDetail } from "@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data";
+import * as SupplierdeliverRecordDetailApi from "@/api/wms/supplierdeliverRecordDetail";
 import * as ItemPackageApi from "@/api/wms/itempackage";
-import {Itempackaging} from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data";
-import {validatePositiveNumber} from "@/utils/validator";
+import { Itempackaging } from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data";
+import { validatePositiveNumber } from "@/utils/validator";
 import {
   Productionlineitem
 } from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data";
-import {getProductionlineitemPage} from "@/api/wms/productionlineitem";
+import { getProductionlineitemPage } from "@/api/wms/productionlineitem";
 import * as ProductionlineitemApi from "@/api/wms/productionlineitem";
 import {
   Supplieritem
 } from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
-import {getSupplieritemPage} from "@/api/wms/supplieritem";
+import { getSupplieritemPage } from "@/api/wms/supplieritem";
 import * as SupplieritemApi from "@/api/wms/supplieritem";
+console.log(44, SupplierdeliverRecordMain.allSchemas)
+console.log(44, SupplierdeliverRecordDetail.allSchemas)
+// const SupplierdeliverRecordMainAllSchemas = cloneDeep(SupplierdeliverRecordMain.allSchemas)
+// const SupplierdeliverRecordDetailAllSchemas = cloneDeep(SupplierdeliverRecordDetail.allSchemas)
+// const allSchemas = cloneDeep(SupplierdeliverRecordDetail.allSchemas)
+const allSchemas = ref(cloneDeep(SupplierdeliverRecordMain.allSchemas))
+allSchemas.value.tableColumns = [
+  ...SupplierdeliverRecordMain.allSchemas.tableColumns,
+  ...SupplierdeliverRecordDetail.allSchemas.tableMainColumns
+]
 
 // 表单校验
 export const PackageRules = reactive({
@@ -51,30 +62,30 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     }
   },
-  {
-    label: '标签模板',
-    field: 'template',
-    sort: 'custom',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '标签状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: true,
-    dictType: DICT_TYPE.LABEL_STATUS,
-    dictClass: 'string',
-    table: {
-      width: 180
-    }
-  },
+  // {
+  //   label: '标签模板',
+  //   field: 'template',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '标签状态',
+  //   field: 'status',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   dictType: DICT_TYPE.LABEL_STATUS,
+  //   dictClass: 'string',
+  //   table: {
+  //     width: 180
+  //   }
+  // },
   {
     label: '关联号',
     field: 'relateNumber',
     sort: 'custom',
-    isSearch:true,
+    isSearch: true,
     table: {
       width: 210
     }
@@ -87,60 +98,60 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       width: 380,
     }
   },
-  {
-    label: '打印次数',
-    field: 'printTimes',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0
-      },
-      value: 0
-    },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印时间',
-    field: 'lastPrintTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印人ID',
-    field: 'lastPrintUserId',
-    sort: 'custom',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印人用户名',
-    field: 'lastPrintUserName',
-    sort: 'custom',
-    table: {
-      width: 180,
-    }
-  },
+  // {
+  //   label: '打印次数',
+  //   field: 'printTimes',
+  //   sort: 'custom',
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 0
+  //     },
+  //     value: 0
+  //   },
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '最后打印时间',
+  //   field: 'lastPrintTime',
+  //   sort: 'custom',
+  //   formatter: dateFormatter,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width: '100%' },
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '最后打印人ID',
+  //   field: 'lastPrintUserId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '最后打印人用户名',
+  //   field: 'lastPrintUserName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180,
+  //   }
+  // },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    isSearch:true,
+    isSearch: true,
     isForm: false,
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
@@ -168,12 +179,12 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
     formatter: dateFormatter,
     detail: {
-      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -206,7 +217,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -236,7 +247,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
 
 export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -248,7 +259,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'code',
         searchTitle: '物料信息',
         searchAllSchemas: Itembasic.allSchemas,
@@ -261,7 +272,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'enableBuy',
           value: 'TRUE',
           isMainValue: false
-          }],
+        }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -274,40 +285,40 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
       width: 150,
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150,
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150,
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
@@ -320,7 +331,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
@@ -333,11 +344,96 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
   },
+  {
+    label: '物料类型',
+    field: 'itemType',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_TYPE,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'Select',
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '物料状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_STATUS,
+    dictClass: 'string',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Select',
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '受入号',
+    field: 'receivedNumber',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'Select',
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+      value: 0
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '包装规格',
     field: 'packUnit',
@@ -359,7 +455,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           {
             key: 'itemCode',
             value: 'itemCode',
-            message: '请选择物料代码',
+            message: '请选择品番',
             isMainValue: true
           },
           {
@@ -379,7 +475,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
@@ -387,36 +483,6 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     }
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      },
-      value: 0
-    },
-  },
-  {
-    label: '受入号',
-    field: 'receivedNumber',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps:{
-        disabled: true
-      }
-    },
-  },
   {
     label: '生产线区分',
     field: 'productionLine',
@@ -439,7 +505,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           {
             key: 'itemCode',
             value: 'itemCode',
-            message: '请选择物料代码',
+            message: '请选择品番',
             isMainValue: true
           },
           {
@@ -451,20 +517,18 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+
   {
-    label: '物料状态',
-    field: 'status',
+    label: '',
+    field: '',
     sort: 'custom',
-    dictType: DICT_TYPE.ITEM_STATUS,
-    dictClass: 'string',
+    isSearch: false,
     table: {
-      width: 120
+      width: 150
     },
     form: {
-      componentProps:{
-        disabled: true
-      }
-    },
+      component: 'err'
+    }
   },
   {
     label: '供应商代码',
@@ -487,14 +551,14 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
           {
             key: 'itemCode',
             value: 'itemCode',
-            message: '请选择物料代码',
+            message: '请选择品番',
             isMainValue: true
           },
           {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }],
         verificationParams: [{
           key: 'supplierCode',
           action: '==',
@@ -514,7 +578,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
@@ -527,7 +591,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     search: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         disabled: false,
@@ -537,7 +601,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -571,8 +635,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择发货单号',
         searchField: 'asnNumber',
         searchTitle: '发货信息',
-        searchAllSchemas: SupplierdeliverRecordMain.allSchemas,
-        searchPage: SupplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage,
+        searchAllSchemas: allSchemas.value,
+        searchPage: SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPageWMS,
         searchCondition: [
           {
             key: 'supplierCode',
@@ -580,6 +644,12 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
             message: '请填写供应商代码！',
             isMainValue: true
           },
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请填写品番！',
+            isMainValue: true
+          },
           {
             key: 'available',
             value: 'TRUE',
@@ -596,6 +666,34 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
   {
     label: '采购订单备注',
     field: 'purchaseOrderRemarks',
@@ -605,11 +703,75 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
   },
+
+  {
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+      },
+    },
+  },
+  {
+    label: '采购计量单位',
+    field: 'purchaseUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0
+      }
+    },
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+  },
+  {
+    label: '采购数量',
+    field: 'purchaseQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+      },
+    },
+  },
   {
     label: '月台',
     field: 'toDockCode',
@@ -644,52 +806,44 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '受入地',
-    field: 'receivedLocation',
+    label: '默认收货库区',
+    field: 'defaultReceivingArea',
     sort: 'custom',
     isSearch: true,
     table: {
       width: 150
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
   },
   {
-    label: '默认收货库区',
-    field: 'defaultReceivingArea',
+    label: '受入地',
+    field: 'receivedLocation',
     sort: 'custom',
     isSearch: true,
     table: {
       width: 150
     },
     form: {
-      componentProps:{
+      componentProps: {
         disabled: true
       }
     },
   },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-  },
+
 ]))
 
 //表单校验
 export const PackageRulesInventor = reactive({
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   qty: [
     { required: true, message: '请输入数量', trigger: 'blur' },
-    { validator:validatePositiveNumber, message: '必须是一个正数', trigger: 'change'}
+    { validator: validatePositiveNumber, message: '必须是一个正数', trigger: 'change' }
   ],
   toDockCode: [
     { required: true, message: '请选择月台代码', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
index 919eb3347..662ba7dd2 100644
--- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
index 94b32ddc0..b2368b840 100644
--- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
@@ -76,55 +76,55 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       width: 380,
     }
   },
-  {
-    label: '打印次数',
-    field: 'printTimes',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0
-      },
-      value: 0
-    },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印时间',
-    field: 'lastPrintTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印人ID',
-    field: 'lastPrintUserId',
-    sort: 'custom',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '最后打印人用户名',
-    field: 'lastPrintUserName',
-    sort: 'custom',
-    table: {
-      width: 180,
-    }
-  },
+  // {
+  //   label: '打印次数',
+  //   field: 'printTimes',
+  //   sort: 'custom',
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 0
+  //     },
+  //     value: 0
+  //   },
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '最后打印时间',
+  //   field: 'lastPrintTime',
+  //   sort: 'custom',
+  //   formatter: dateFormatter,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '最后打印人ID',
+  //   field: 'lastPrintUserId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   }
+  // },
+  // {
+  //   label: '最后打印人用户名',
+  //   field: 'lastPrintUserName',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180,
+  //   }
+  // },
   {
     label: '是否可用',
     field: 'available',
diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
index ef2c07c70..a5d9d2b0a 100644
--- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue
index 17168e7cd..eac4d43f1 100644
--- a/src/views/wms/basicDataManage/orderManage/owner/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue
index f8d72f261..0989c2905 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue
index 1b13768ce..b424a794a 100644
--- a/src/views/wms/basicDataManage/orderManage/team/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/team/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/strategySetting/condition/index.vue b/src/views/wms/basicDataManage/strategySetting/condition/index.vue
index fe01c9e46..7f1168c6b 100644
--- a/src/views/wms/basicDataManage/strategySetting/condition/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/condition/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/strategySetting/configuration/index.vue b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue
index 4207641fd..6d1bd428e 100644
--- a/src/views/wms/basicDataManage/strategySetting/configuration/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
index 97c9e7e17..9724e7454 100644
--- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
index f4de1748c..b9d91f582 100644
--- a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
index 6ed2a8dcc..1619ba5ae 100644
--- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
index f75ecb889..171db4c5a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
@@ -300,11 +300,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
-        formData.value.condition.forEach((item, index) => {
-          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
-            item.Value = item.Value.split(',')
-          }
-        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
index c39fed41c..48cfd7904 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
@@ -442,8 +442,8 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {
-          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
-            item.Value = item.Value.split(',')
+          if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' ) {
+          item.Value = item.Value.split(',')
           }
         })
       }
@@ -733,9 +733,14 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
   
   if(searchTableModule.value == 'condition'){
     // module: config 配置  condition 条件
-    // 仓库 库区 库位 库位组
-    let conditionObj  = formData.value.condition.find(item=>['ItemCode','WarehouseCode','AreaCode','LocationGroupCode','LocationCode'].includes(item['ParamCode']))
-    conditionObj['Value'] = val.map(item=>(item['code'])).join(',')
+    // 供应商客户
+    if (formField == 'SupplierCode' || formField == 'CustomerCode') {
+      let conditionObj = formData.value.condition.find(item => ['SupplierCode', 'CustomerCode'].includes(item['ParamCode']))
+      conditionObj['Value'] = val.map(item=>(item['code'])).join(',')
+    } else if (formField == 'ItemCode') {
+      let conditionObjItem = formData.value.condition.find(item => [ 'ItemCode'].includes(item['ParamCode']))
+      conditionObjItem['Value'] = val.map(item=>(item['code'])).join(',')
+    }
   }else{
     // 配置
     // 仓库 库区 库位 库位组
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
index 4b78e4c9d..d46dd2be8 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
@@ -983,6 +983,7 @@ const searchWarehouse = ()=>{
   
 }
 const searchTableSuccess = (formField, searchField, val, type, row) => {
+  console.log(77,formField)
   if(formField=='Productionline'){
     let transactionType = formData.value.condition.find(item=>item['ParamCode']=='Productionline')
     if(transactionType){
@@ -1067,10 +1068,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {
-          if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
-            item.Value = item.Value.split(',')
-          }
-          if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' || item.ParamCode == 'CustomerCode' ) {
+          if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' ) {
             console.log(item.Value)
             item.Value = item.Value.split(',')
           }
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 81056e690..aecd1cbbb 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -807,11 +807,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {
-          console.log(item)
-          if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
-            console.log(item.Value)
-            item.Value = item.Value.split(',')
-          }
           if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus') {
             console.log(item.Value)
             item.Value = item.Value.split(',')
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
index 6ac7ff952..bc80c97d1 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
@@ -287,7 +287,7 @@ const formData = ref({
     { ParamCode: 'SupplierType', Operator: '==', Value: '' },
     // 供应商
     { ParamCode: 'SupplierCode', Operator: '==', Value: '' },
-    // 物料代码
+    // 品番
     { ParamCode: 'ItemCode', Operator: 'IN', Value: [] }
   ],
   configuration: {
@@ -536,7 +536,7 @@ const resetForm = () => {
       { ParamCode: 'SupplierType', Operator: '==', Value: '' },
       // 供应商
       { ParamCode: 'SupplierCode', Operator: '==', Value: '' },
-      // 物料代码
+      // 品番
       { ParamCode: 'ItemCode', Operator: 'IN', Value: [] }
     ],
     configuration: {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
index 871342dee..b542c19c3 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
@@ -474,11 +474,12 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {
-          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+           if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' ) {
+            console.log(item.Value)
             item.Value = item.Value.split(',')
           }
         })
-        console.log(formData.value.condition)
+        // console.log(formData.value.condition)
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
index 7ebeee92e..bf8534f94 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@@ -466,11 +466,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
-        formData.value.condition.forEach((item, index) => {
-          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
-            item.Value = item.Value.split(',')
-          }
-        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -747,12 +742,17 @@ const blurWarehouse = async ({module='config',type})=>{
   }
 }
 const searchTableSuccess = (formField, searchField, val, type, row) => {
-  
+  console.log(formField)
   if(searchTableModule.value == 'condition'){
     // module: config 配置  condition 条件
     // 仓库 库区 库位 库位组
-    let conditionObj  = formData.value.condition.find(item=>['ItemCode','WarehouseCode','AreaCode','LocationGroupCode','LocationCode'].includes(item['ParamCode']))
-    conditionObj['Value'] = val.map(item=>(item['code'])).join(',')
+    if (formField == 'WarehouseCode' || formField == 'AreaCode' ||formField == 'LocationGroupCode' ||formField == 'LocationCode' ) {
+      let conditionObj = formData.value.condition.find(item => ['WarehouseCode', 'AreaCode', 'LocationGroupCode', 'LocationCode'].includes(item['ParamCode']))
+      conditionObj['Value'] = val.map(item=>(item['code'])).join(',')
+    } else if (formField == 'ItemCode') {
+      let conditionObjItem = formData.value.condition.find(item => [ 'ItemCode'].includes(item['ParamCode']))
+      conditionObjItem['Value'] = val.map(item=>(item['code'])).join(',')
+    }
   }else{
     // 配置
     // 仓库 库区 库位 库位组
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index aba846a01..74261b5d3 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -1251,13 +1251,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {
-          if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& !Array.isArray(item.Value)) {
-            if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' && item.ParamCode != 'LocationGroupCode' && item.ParamCode != 'LocationCode') {
+          if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' && item.ParamCode != 'LocationGroupCode' && item.ParamCode != 'LocationCode') {
               if (item.Value) {
                item.Value = item.Value.split(',')
               }
             }
-          }
         })
       }
       if (data.configuration) {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
index c226515df..f42ea124d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@@ -411,11 +411,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       // }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
-        formData.value.condition.forEach((item, index) => {
-          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
-            item.Value = item.Value.split(',')
-          }
-        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue
index 64df63efc..bfb1e30ff 100644
--- a/src/views/wms/basicDataManage/subject/mstr/index.vue
+++ b/src/views/wms/basicDataManage/subject/mstr/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
index 2a5af579d..92e016ed8 100644
--- a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
+++ b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/subject/qadProject/index.vue b/src/views/wms/basicDataManage/subject/qadProject/index.vue
index 32539d6a4..471483e68 100644
--- a/src/views/wms/basicDataManage/subject/qadProject/index.vue
+++ b/src/views/wms/basicDataManage/subject/qadProject/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
index 906898ae0..5ee057e3d 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
index df61fa1bd..2b123a47f 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
@@ -68,7 +68,7 @@ export const SubjectAccount = useCrudSchemas(
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'costcentreCode', // 查询弹窗赋值字段
           searchTitle: '成本中心信息', // 查询弹窗标题
           searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
@@ -130,7 +130,7 @@ export const SubjectAccount = useCrudSchemas(
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'projectCode', // 查询弹窗赋值字段
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
index 1976de2c4..3adc162e9 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
index e32df87ff..a17186a43 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
@@ -49,7 +49,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -61,7 +61,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '供应商物料信息', // 查询弹窗标题
         searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
@@ -87,6 +87,16 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    hiddenSearchHigh:true,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '货币',
     field: 'currency',
@@ -271,7 +281,7 @@ export const PurchasepriceRules = reactive({
     { required: true, message: '请输入供应商代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
   currency: [
     { required: true, message: '请选择货币', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
index 39522d698..8f2faf30c 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
index 951cc7519..50cb8cde4 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
@@ -49,7 +49,7 @@
         <Icon :size="16" v-show="row.sunday==1" icon="ep:check" />
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
index 9dc9b43fb..844d05b9d 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 784cb3b88..168b3af0c 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -70,7 +70,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -82,7 +82,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -104,7 +104,19 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '背番',
+    field: 'backNumber',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    hiddenSearchHigh:true,
+    tableForm:{
+      disabled:true,
+    }
+  },
+  {
+    label: '品名',
     field: 'itemName',
     isForm:true,
     form:{
@@ -117,7 +129,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '供应商物料代码',
+    label: '供应商品番',
     field: 'supplierItemCode',
     sort: 'custom',
     isSearch: false,
@@ -413,10 +425,10 @@ export const SupplieritemRules = reactive({
     { required: true, message: '请输入供应商代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
   supplierItemCode: [
-    { required: true, message: '请输入供应商物料代码', trigger: 'change' },
+    { required: true, message: '请输入供应商品番', trigger: 'change' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
index eb0a90c30..eba409151 100644
--- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
index 7539af6cf..d953505bd 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
index 862db6be2..d8e50c08a 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
@@ -32,8 +32,11 @@
           <span>{{ row.id }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row, $index }">
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -162,10 +165,12 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:supplier-user:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplier-user:delete'}), // 删除
-]
+const butttondata =(row,$index) => {
+  return [
+      defaultButtons.mainListEditBtn({hasPermi:'wms:supplier-user:update'}), // 编辑
+      defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplier-user:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
index 0d8090c8b..70b434cb5 100644
--- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue
index 673b7b85d..248845fbc 100644
--- a/src/views/wms/buttMesManage/mesBarCode/index.vue
+++ b/src/views/wms/buttMesManage/mesBarCode/index.vue
@@ -40,7 +40,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
index f5ee27716..df6d1752a 100644
--- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
+++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
@@ -52,7 +52,7 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: 'WMS物料代码',
+    label: 'WMS品番',
     field: 'lowerLim',
     sort: 'custom',
     isSearch: true,
@@ -129,7 +129,7 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '客户物料代码字符长度',
+    label: '客户品番字符长度',
     field: 'lengthMat',
     sort: 'custom',
     table: {
@@ -149,7 +149,7 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '客户物料代码',
+    label: '客户品番',
     field: 'partNumber',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index 0256bd71e..c65d6ea37 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -612,7 +612,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -620,7 +620,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -685,7 +685,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -693,7 +693,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 0dba679a4..694748be6 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -38,7 +38,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 06e5da55d..864b93dcc 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -530,7 +530,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -618,7 +618,7 @@ export const CountPlanMainRules = reactive({
 //     }
 //   },
 //   {
-//     label: '物料代码',
+//     label: '品番',
 //     field: 'itemCode',
 //     sort: 'custom',
 //     table: {
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 78d3af8d5..344f457c9 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -38,7 +38,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -1203,7 +1203,7 @@ const getCustomerAllList = async (row, update_countPlanAllList = false) => {
     countPlanAllList.value = allList.value.customerAllList
   }
 }
-// 获取物料代码列表
+// 获取品番列表
 const getItembasicAllList = async (row, update_countPlanAllList = false) => {
   let getLoading = null
   let res = null
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index 227d49118..db0835f1e 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -370,7 +370,7 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -378,7 +378,7 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -446,7 +446,7 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -454,7 +454,7 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -642,7 +642,7 @@ export const CountRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue
index a3a7ae8f5..34c4ae0db 100644
--- a/src/views/wms/countManage/count/countRecordMain/index.vue
+++ b/src/views/wms/countManage/count/countRecordMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 22219509a..4c979636c 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -322,7 +322,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -390,7 +390,7 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -398,7 +398,7 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -408,7 +408,7 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -418,7 +418,7 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
index 9c4a60078..b785e34a2 100644
--- a/src/views/wms/countManage/count/countRequestMain/index.vue
+++ b/src/views/wms/countManage/count/countRequestMain/index.vue
@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase
+        <ButtonBaseMore
         :Butttondata="butttondata(row,$index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index 2702e1c3b..a5079c34d 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -314,7 +314,7 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -322,7 +322,7 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -330,7 +330,7 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -338,7 +338,7 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -524,7 +524,7 @@ export const CountadjustRecordDetailRules =reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
index 0dae8fcac..939537a21 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index d3918e677..e9acaff7c 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -310,7 +310,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -368,7 +368,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -376,7 +376,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -386,7 +386,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -396,7 +396,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -634,6 +634,6 @@ export const CountadjustRequestDetailRules = reactive({
   //   { required: true, message: '请输入单据号', trigger: 'blur' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index 3fc7452a7..b8ac83533 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts
index 8080d8162..bf02b7f9d 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts
@@ -201,6 +201,14 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
   },
+  {
+    label: '回转凭证号',
+    table:{
+      width:180
+    },
+    field: 'allocationTransferNumber',
+    sort: 'custom',
+  },
   
   {
     label: '备注',
@@ -303,7 +311,7 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled:true,
     //   multiple:true,
     //   isInpuFocusShow: true, // 开启查询弹窗
-    //   searchListPlaceholder: '请选择物料代码',
+    //   searchListPlaceholder: '请选择品番',
     //   searchField: 'code',
     //   searchTitle: '物料基础信息',
     //   searchAllSchemas: Itembasic.allSchemas,
@@ -328,7 +336,7 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
     //   // labelMessage: '信息提示说明！！！',
     //   componentProps: {
     //     isSearchList: true, // 开启查询弹窗
-    //     searchListPlaceholder: '请选择物料代码',
+    //     searchListPlaceholder: '请选择品番',
     //     searchField: 'code',
     //     searchTitle: '物料基础信息',
     //     searchAllSchemas: Itembasic.allSchemas,
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue
index e1c5026cd..96d4e66da 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue
@@ -54,12 +54,12 @@
             updateOriginFormModel(formModel)
           }
           // 2.主数据税额 mainTaxAmount = 未税金额*税率/100 保留两位小数
-          let mainTaxAmount = Number(Number(beforeTaxAmount*taxRate*0.01).toFixed(2))
+          let mainTaxAmount = Number(beforeTaxAmount*taxRate*0.01).toFixed(2)
           formRef.value.setValues({
             // 主数据税额 
             taxAmount:mainTaxAmount,
             // 主数据价税合计金额：mainAdTaxAmount =未税金额+税额
-            adTaxAmount:beforeTaxAmount+taxAmount
+            adTaxAmount:beforeTaxAmount+parseFloat(taxAmount)
           })
         }
       }
@@ -70,14 +70,14 @@
         // 1、主数据未税金额 mainBeforeTaxAmount : 所有明细行未税金额的和 
         let mainBeforeTaxAmount = tableData.reduce((prev, item) =>prev + Number(item['beforeTaxAmount'].toFixed(2)),0).toFixed(2)
         // 2.主数据税额 mainTaxAmount = 未税金额*税率/100 保留两位小数
-        let mainTaxAmount = Number(Number(mainBeforeTaxAmount*taxRate*0.01).toFixed(2))
+        let mainTaxAmount = Number(mainBeforeTaxAmount * taxRate * 0.01).toFixed(2)
         const sumObject = {
           // 主数据未税金额
           beforeTaxAmount:mainBeforeTaxAmount,
           // 主数据税额 
           taxAmount:mainTaxAmount,
           // 主数据价税合计金额：mainAdTaxAmount =未税金额+税额
-          adTaxAmount:mainBeforeTaxAmount+mainTaxAmount
+          adTaxAmount:(Number(mainBeforeTaxAmount)+Number(mainTaxAmount)).toFixed(2)
         }
         formRef.value.setValues(sumObject)
       }
@@ -88,6 +88,7 @@
 import { CustomerSaleInvoiceMain,CustomerSaleInvoiceMainRules,CustomerSaleInvoiceDetailRules,CustomerSaleInvoiceDetail} from './customerSaleInvoiceRequestMain.data'
 import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain'
 import * as CustomerStatementDetailApi from '@/api/wms/customerStatementDetail'
+import Decimal from "decimal.js"
 // 传递给父类
 const emit = defineEmits([
   'buttonBaseClick','getList'
@@ -135,23 +136,28 @@ const onChange = (field, cur, formRef)=>{
     // 税额：taxAmount  未税价格*税率/100,四舍五入保留2位小数
     tableData.value.forEach(item=>{
       item['taxAmount'] = (item['beforeTaxAmount'] * cur)/100 //含税金额
+      // 含税金额 = 未税价格+税额,四舍五入保留2位小数
+      item['afterTaxAmount'] = item['beforeTaxAmount'] + item['taxAmount']
     })
   }
 }
 const inputNumberChange = (field, index, row, val) => {
   console.log('inputNumberChange',field, index, row, val)
+  console.log(row['beforeTaxAmount'])
+  console.log(row['taxAmount'])
   
-  // 含税金额 = 未税价格+税额,四舍五入保留2位小数
-  row['afterTaxAmount'] = row['beforeTaxAmount'] + row['taxAmount']
 
   // 模具分摊单价 默认从模具分摊对账单带出，未税金额修改后重新计算，等于未税金额/数量-销售单价
   row['allocationPrice'] = row['beforeTaxAmount']/row['qty'] - row['price']
   
   // 合计单价 = 销售单价 + 模具分摊单价
-  row['sumPrice'] = row['price'] + row['allocationPrice']
+  row['sumPrice'] = (row['price'] + row['allocationPrice']).toFixed(5)
   
   // 税额：taxAmount  未税价格*税率/100,四舍五入保留2位小数
   row['taxAmount'] = (row['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 //含税金额
+  
+  // 含税金额 = 未税价格+税额,四舍五入保留2位小数
+  row['afterTaxAmount'] = row['beforeTaxAmount'] + row['taxAmount']
 
   
 }
@@ -175,7 +181,7 @@ const submitForm = async (formType, submitData) => {
   })
   if (isExist) {
     formRef.value.formLoading = false
-    return message.warning('物料代码重复')
+    return message.warning('品番重复')
   }
   data.subList.forEach(obj => {
     if(obj.qty == 0){
@@ -277,9 +283,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 // 初始化计算子表
 const initTableDataPrice = ()=>{
   tableData.value.forEach(item=>{
-    item['sumPrice'] = item['price'] + item['allocationPrice']
+    item['sumPrice'] = (item['price'] + item['allocationPrice']).toFixed(5)
     // 未税金额 默认等于数量*合计单价，可修改，必填，最多可输入2位小数
-    item['beforeTaxAmount'] = item['sumPrice']*item['qty']
+    item['beforeTaxAmount'] = Number(new Decimal(Number(item['sumPrice'])).mul(new Decimal(item['qty'])).toNumber().toFixed(2))
 
     // 税额：taxAmount  未税价格*税率/100,四舍五入保留2位小数
     item['taxAmount'] = (item['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 //含税金额
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
index 87d32b5a1..1df99173c 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
@@ -340,7 +340,7 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled:true,
     //   multiple:true,
     //   isInpuFocusShow: true, // 开启查询弹窗
-    //   searchListPlaceholder: '请选择物料代码',
+    //   searchListPlaceholder: '请选择品番',
     //   searchField: 'code',
     //   searchTitle: '物料基础信息',
     //   searchAllSchemas: Itembasic.allSchemas,
@@ -365,7 +365,7 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
     //   // labelMessage: '信息提示说明！！！',
     //   componentProps: {
     //     isSearchList: true, // 开启查询弹窗
-    //     searchListPlaceholder: '请选择物料代码',
+    //     searchListPlaceholder: '请选择品番',
     //     searchField: 'code',
     //     searchTitle: '物料基础信息',
     //     searchAllSchemas: Itembasic.allSchemas,
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue
index fd63549de..c327618fc 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -57,24 +57,21 @@
     :detailButtonIsShowDelete="false"
     :detailButtonIsShowAdd="false"
     :otherHeadButttonData = "[defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-request-main:export` })]"
-    :sumFormDataByForm="
-      (formRef, formModel) => {console.log('formModel====',formModel)
-        const { beforeTaxAmount = 0, taxAmount = 0 , qty=0,price,allocationPrice,taxRate=1} = formModel
-        formRef.value.setValues({
-          // 含税金额 = 未税价格+税额,四舍五入保留2位小数
-          afterTaxAmount: Number((Number(beforeTaxAmount) + Number(taxAmount)).toFixed(2)),
-          // 模具分摊单价 默认从模具分摊对账单带出，未税金额修改后重新计算，等于未税金额/数量-销售单价
-          allocationPrice: Number(Number(Number(beforeTaxAmount)/Number(qty)) - Number(price)),
-          // 合计单价 = 销售单价 + 模具分摊单价
-          sumPrice:Number(Number(price)+Number(allocationPrice)),
-          // 税额：taxAmount  未税价格*税率/100,四舍五入保留2位小数
-          taxAmount: Number((Number(beforeTaxAmount) * Number(taxRate)))/100 //含税金额
-        })
-      }
-    "
+    @detailBasicFormOnChange="detailBasicFormOnChange"
+  
     @buttonBaseClick="detailButtonBaseClick"
     @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
+  >
+    <template #taxAmount="scrop">
+      {{scrop.row.taxAmount.toFixed(2)}}
+    </template>
+    <template #afterTaxAmount="scrop">
+      {{scrop.row.afterTaxAmount.toFixed(2)}}
+    </template>
+    <template #beforeTaxAmount="scrop">
+      {{scrop.row.beforeTaxAmount.toFixed(2)}}
+    </template>
+  </Detail>
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/deliver-plan-main/import" :importTemplateData="importTemplateData"
@@ -260,13 +257,13 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: any) => {
-  formRef.value.openForm(type,row)
+  formRef.value.openForm(type, row)
 }
 
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,'planDeliverMain')
+  detailRef.value.openDetail(row, titleName, titleValue, 'planDeliverMain')
 }
 
 
@@ -346,6 +343,20 @@ const onSearchChange = (field, value)=>{
     }
   }
 }
+const detailBasicFormOnChange = (field, cur, formRef1) => {
+  console.log( formRef1.value.formModel)
+  const { beforeTaxAmount = 0, taxAmount = 0, qty = 0, price, allocationPrice, taxRate = 1 } = formRef1.value.formModel
+  formRef1.value.setValues({
+    // 含税金额 = 未税价格+税额,四舍五入保留2位小数
+    afterTaxAmount: Number((Number(beforeTaxAmount) + Number(taxAmount)).toFixed(2)),
+    // 模具分摊单价 默认从模具分摊对账单带出，未税金额修改后重新计算，等于未税金额/数量-销售单价
+    allocationPrice: Number(Number(Number(beforeTaxAmount)/Number(qty)) - Number(price)),
+    // 合计单价 = 销售单价 + 模具分摊单价
+    sumPrice:Number(Number(price)+Number(allocationPrice)),
+    // 税额：taxAmount  未税价格*税率/100,四舍五入保留2位小数
+    taxAmount: Number((Number(beforeTaxAmount) * Number(taxRate)))/100 //含税金额
+  })
+}
 const searchClick = async (data)=>{
   console.log('查询',data)
   setSearchParams({...data,customerCode:data.customerCode.filter(item=>item!='ALL'),status:data.status.filter(item=>item!='')})
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
index c85779a32..1b7572b42 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
@@ -458,7 +458,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -466,7 +466,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -474,7 +474,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -483,7 +483,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain:true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -834,7 +834,7 @@ export const CustomerreceiptRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index 2051d9ead..7652905cc 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -519,7 +519,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -527,7 +527,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -535,7 +535,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -544,7 +544,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     hiddenInMain:true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -788,6 +788,6 @@ export const CustomerreceiptRequestDetailRules = reactive({
     { required: true, message: '请选择到库位代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
index 65d109699..818caf61a 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
@@ -771,7 +771,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -779,7 +779,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -787,7 +787,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -796,7 +796,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemdesc2',
     sort: 'custom',
     table: {
@@ -1010,7 +1010,7 @@ export const CustomerreturnJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index 784e6e913..4958f0ec6 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -586,7 +586,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -594,7 +594,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -602,7 +602,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -611,7 +611,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain:true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -999,7 +999,7 @@ export const CustomerreturnRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index f330bd34f..362e23790 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -917,7 +917,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   }
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -933,7 +933,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -943,7 +943,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -954,7 +954,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1295,7 +1295,7 @@ function validateQty(rule, value, callback) {
 //表单校验
 export const CustomerreturnRequestDetailRules = reactive({
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   // toLocationCode: [
   //   { required: true, message: '请选择到库位代码', trigger: 'blur' }
@@ -1313,7 +1313,7 @@ export const CustomerreturnRequestDetailRules = reactive({
 
 export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1329,7 +1329,7 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1341,7 +1341,7 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1353,7 +1353,7 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1588,7 +1588,7 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
 export const DeliverReturnRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
 
 {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
index 6afca0070..a58442b8c 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
@@ -347,7 +347,7 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -355,7 +355,7 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -363,7 +363,7 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -371,7 +371,7 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -613,7 +613,7 @@ export const CustomersettleRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
index cb5318166..0b2ac3a01 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -482,7 +482,7 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   }
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -498,7 +498,7 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -508,7 +508,7 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -518,7 +518,7 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -750,6 +750,6 @@ export const CustomersettleRequestDetailRules = reactive({
   //   { required: true, message: '请选择从库位代码', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index 3b9025845..63f01df0b 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -762,7 +762,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -770,7 +770,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -778,7 +778,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -787,7 +787,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemdesc2',
     sort: 'custom',
     table: {
@@ -1002,7 +1002,7 @@ export const DeliverJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index 25d4c3990..eb33043b3 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index 3e75b3635..8294bc888 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -554,7 +554,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -562,7 +562,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -570,7 +570,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -579,7 +579,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -934,7 +934,7 @@ export const DeliverRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
index a5ae5a1bc..a498edadb 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index e26dc5738..fb5417eea 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -674,7 +674,7 @@ export const DeliverRequestMain = useCrudSchemas(
       isDetail: false,
       isForm: false,
       table: {
-        width: 300,
+        width: 250,
         fixed: 'right'
       }
     }
@@ -816,7 +816,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   }
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -826,7 +826,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       isShowTableFormSearch: true,
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '客户物料基础信息',
       searchAllSchemas: Customeritem.allSchemas,
@@ -844,7 +844,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '客户物料基础信息',
         searchAllSchemas: Customeritem.allSchemas,
@@ -853,7 +853,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -863,7 +863,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -874,7 +874,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1189,7 +1189,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const DeliverRequestDetailRules = reactive({
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index dd94e3f2a..3baa1316e 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -36,7 +36,7 @@
       </template>
 
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -182,7 +182,7 @@ const searchTableSuccess =  (formField, searchField, val, formRef, type, row ) =
       if(formField == 'deliverPlanNumber') {
         setV['deliverPlanNumber'] = val[0]['number']
         tableData.value = []
-        //物料代码-子表
+        //品番-子表
         let subRes = await DeliverPlanDetailApi.getDeliverPlanDetailPage({
           number:val[0]['number']
         })
@@ -603,7 +603,7 @@ const submitForm = async (formType, submitData) => {
   data.businessType = businessType.value
     console.log(data);
   if (isExist) {
-    return message.warning('物料代码重复')
+    return message.warning('品番重复')
   }
   data.subList.forEach(obj => { 
     if(obj.qty == 0){
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 8c8b5c11c..970c92dc9 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -610,7 +610,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -619,7 +619,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple:true,
       // isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       disabled:true,
       searchField: 'itemCode',
       searchTitle: '客户物料基础信息',
@@ -639,7 +639,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '客户物料基础信息',
         searchAllSchemas: Customeritem.allSchemas,
@@ -893,7 +893,7 @@ export const DeliverPlanDetailRules = reactive({
     { required: true, message: '请选择客户月台代码', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   toLocationCode: [
     { required: true, message: '请选择到库位代码', trigger: 'change' }
@@ -931,7 +931,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
  {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -940,7 +940,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '客户物料基础信息',
       searchAllSchemas: Customeritem.allSchemas,
@@ -949,7 +949,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '客户物料基础信息',
         searchAllSchemas: Customeritem.allSchemas,
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 78cbad88b..9366d1244 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -494,7 +494,7 @@ const submitForm = async (formType, submitData) => {
   })
   if (isExist) {
     formRef.value.formLoading = false
-    return message.warning('物料代码重复')
+    return message.warning('品番重复')
   }
   data.subList.forEach(obj => {
     if(obj.qty == 0){
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
index de7788fe2..2bb07ae55 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
index 7cfa29638..801c75947 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
@@ -586,7 +586,7 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -594,7 +594,7 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '物料基础信息', // 查询弹窗标题
       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -609,7 +609,7 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -758,7 +758,7 @@ export const SaleDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
 
   remark:  [
@@ -787,7 +787,7 @@ export const SaleDetailAndMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -795,7 +795,7 @@ export const SaleDetailAndMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '物料基础信息', // 查询弹窗标题
       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -810,7 +810,7 @@ export const SaleDetailAndMain = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index 2887db8ea..cc2438032 100644
--- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -307,7 +307,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -315,7 +315,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -323,7 +323,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -332,7 +332,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -687,7 +687,7 @@ export const DeliverRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue
index 22f2846e5..0441b0036 100644
--- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue
@@ -36,7 +36,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" 
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" 
                    @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index 431ea8ea0..e7a3cd1df 100644
--- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -250,7 +250,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -258,7 +258,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -266,7 +266,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -275,7 +275,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -626,7 +626,7 @@ export const DeliverRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue
index e663e58df..431090d0a 100644
--- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue
@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
index ed303f706..c3382d695 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
@@ -553,7 +553,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -564,7 +564,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
       isShowTableFormSearch: true,
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '客户物料基础信息',
       searchAllSchemas: Customeritem.allSchemas,
@@ -581,7 +581,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -590,7 +590,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -600,7 +600,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1012,7 +1012,7 @@ export const DeliverRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -1198,12 +1198,12 @@ export const ImportLeadershipDocTempData = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'materialCode',
     sort: 'custom',
   },
   {
-    label: '物料描述',
+    label: '描述',
     field: 'materialDesc',
     sort: 'custom',
   },
@@ -1224,12 +1224,12 @@ export const ImportLeadershipDocTempData = useCrudSchemas(reactive<CrudSchema[]>
  */
 export const ImportLeadershipDocErrorData = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'materialCode',
     sort: 'custom',
   },
   {
-    label: '物料描述',
+    label: '描述',
     field: 'materialDesc',
     sort: 'custom',
   },
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
index 19d3fa775..a85520fe6 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -229,7 +229,7 @@ const submitForm = async (formType, submitData) => {
     data.businessType = businessType.value
       console.log(data);
     if (isExist) {
-      return message.warning('物料代码重复')
+      return message.warning('品番重复')
     }
     data.subList.forEach(obj => { 
       if(obj.qty == 0){
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
index 2e0ed0655..96ae6790a 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
@@ -499,7 +499,7 @@ export const CustomerStatementShareReconciliation = useCrudSchemas(reactive<Crud
       component: 'InputNumber',
       value: 0,
       componentProps: {
-        precision: 2
+        precision: 5
       },
     }
     
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
index a27c86eb2..7cbac21d9 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -557,6 +557,7 @@ const handleConfirmShareMoney = async (id: number) => {
   try {
     await message.confirm(t('ts.是否确认分摊金额'))
     await CustomerStatementMainApi.confirmationShare(id)
+    chooseRow.value = 5
     await message.success(t('ts.确认成功'))
   } finally {
     // 刷新列表
@@ -577,7 +578,7 @@ const changeTabs = async (item) => {
   if (item.prop == 'Detail') {
     // 点击明细按钮
     tabsExtend.value = true
-    // 当前物料代码作为条件
+    // 当前品番作为条件
     tableObjectExtend.value = [
       {
         key: 'masterId',
@@ -600,7 +601,7 @@ const changeTabs = async (item) => {
   } else if (item.prop == 'Reconciliation') {
     // 点击对账差异按钮
     tabsExtend.value = true
-    // 当前物料代码作为条件
+    // 当前品番作为条件
     tableObjectExtend.value = [
       {
         key: 'masterId',
@@ -642,7 +643,7 @@ const changeTabs = async (item) => {
   } else if (item.prop == 'ShareReconciliation') {
     // 点击模具分摊对账单按钮
     tabsExtend.value = true
-    // 当前物料代码作为条件
+    // 当前品番作为条件
     tableObjectExtend.value = [
       {
         key: 'masterId',
@@ -797,13 +798,14 @@ const openDetailForm = (row) => {
 const handleDetailSubmitForm = async (formType, data) => {
   await CustomerStatementDetailApi.updateAdjustmentAmount(data.id,data.masterId,data.adjustmentAmount)
   message.success(t('common.updateSuccess'))
-  detailRef.value.submitUpdateList()
+  await detailRef.value.submitUpdateList()
   const amount = ref(0)
   detailRef.value.tableObjectRef.tableList.forEach(item => {
     amount.value  = amount.value + item.adjustmentAmount
   })
+  console.log(22,amount.value)
   // 确认分摊金额
-  if (amount.value == 0) {
+  if (amount.value != 0) {
     otherHeadButttonData.value = [
       {
         label: t(`ts.导出`).replace('ts.', ''),
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/index.vue
index b99e25fc1..d2c6197f3 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/index.vue
@@ -38,7 +38,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue
index 169fe976a..be28f7a71 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row , $index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -74,6 +74,7 @@
     @changeTabs="changeTabs"
     :tableObjectExtend="tableObjectExtend"
     @buttonBaseClick="detailButtonBaseClick"
+    @changeDetailList="changeDetailList"
   >
   <template #amountVariance="{ row }" v-if="tabCurrent.prop == 'ForecastWithBilltDifference'">
       <span
@@ -335,12 +336,12 @@ const changeTabs = async (item) => {
   if (item.prop == 'Detail') {
     // 点击明细按钮
     tabsExtend.value = true
-    // 当前物料代码作为条件
+    // 当前品番作为条件
     tableObjectExtend.value = [{
       key: 'masterId',
       value: chooseRow.value.id
     }]
-    apiPage.value = CustomerToolApportStatementForecastDetailApi.getCustomerToolApportStatementForecastDetailPage
+    apiPage.value = await  CustomerToolApportStatementForecastDetailApi.getCustomerToolApportStatementForecastDetailPage
     DetailAllSchemas.value = CustomerToolApportStatementForecastDetail.allSchemas
     otherHeadButttonData.value = [{
       label: t(`ts.导出`).replace('ts.', ''),
@@ -354,13 +355,13 @@ const changeTabs = async (item) => {
   } else  if (item.prop == 'ForecastWithBilltDifference') {
     // 点击预测与对账单差异
     tabsExtend.value = true
-    // 当前物料代码作为条件
+    // 当前品番作为条件
     tableObjectExtend.value = [{
       key: 'masterId',
       value: chooseRow.value.id
     }]
     DetailAllSchemas.value = ForecastWithBillDifference.allSchemas
-    apiPage.value = CustomerToolApportStatementForecastDetailApi.getCustomerToolApportStatementForecastComparisonPage
+    apiPage.value = await  CustomerToolApportStatementForecastDetailApi.getCustomerToolApportStatementForecastComparisonPage
     otherHeadButttonData.value = [
       {
         label: t(`ts.导出`).replace('ts.', ''),
@@ -378,6 +379,20 @@ const changeTabs = async (item) => {
     otherHeadButttonData.value = []
   }
 }
+const changeDetailList = (apiPage) =>{
+  if (apiPage == CustomerToolApportStatementForecastDetailApi.getCustomerToolApportStatementForecastDetailPage) {
+     detailRef.value.tableObjectRef.tableList.forEach(element => {
+        element.forecastAllocationAmount = element.forecastAllocationAmount.toFixed(5)
+      });
+  } else if(apiPage == CustomerToolApportStatementForecastDetailApi.getCustomerToolApportStatementForecastComparisonPage) {
+    detailRef.value.tableObjectRef.tableList.forEach(element => {
+        element.forecastAllocationAmount = element.forecastAllocationAmount.toFixed(5)
+        element.allocationAmount = element.allocationAmount.toFixed(5)
+        element.amountVariance = element.amountVariance.toFixed(5)
+      });
+  }
+  
+}
 // 点击子表按钮事件
 const detailButtonBaseClick = (val, item, detailTableObject) => {
   if (val == 'exportForecastWithBilltDifference') {
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue
index 2af61f1f1..40c492941 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue
@@ -38,7 +38,7 @@
           </el-button>
         </template>
         <template #action="{ row, $index }">
-          <ButtonBase
+          <ButtonBaseMore
             :Butttondata="butttondata(row, $index)"
             @button-base-click="buttonTableClick($event, row)"
           />
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
index d7eb98b80..6e98326df 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
@@ -157,7 +157,7 @@ export const FinishedShipmentDetailRules = reactive({
 export const FinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
   
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -166,7 +166,7 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -183,7 +183,7 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   // {
-  //   label: '物料描述',
+  //   label: '描述',
   //   field: 'itemDescription',
   //   sort: 'custom',
   //   table: {
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue
index a6028e46f..99fdcd6af 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue
+++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue
@@ -33,6 +33,9 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
+      <template #unitPrice="{row}">
+        <span>{{ row.unitPrice.toFixed(5) }}</span>
+      </template>
       <template #action="{ row }">
         <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
index fdcbe43b1..6af2f7beb 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
@@ -33,6 +33,9 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
+      <template #unitPrice="{row}">
+        <span>{{ row.unitPrice.toFixed(5) }}</span>
+      </template>
       <template #action="{ row }">
         <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
index 1cbadff3e..098e1560f 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
@@ -151,7 +151,7 @@ export const UnfinishedShipmentDetailRules = reactive({
 export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
   
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -160,7 +160,7 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -177,7 +177,7 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   // {
-  //   label: '物料描述',
+  //   label: '描述',
   //   field: 'itemDescription',
   //   sort: 'custom',
   //   table: {
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
index 61506a1e2..927298f00 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
index f63c89bb0..04f1bc054 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@@ -285,7 +285,7 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -293,7 +293,7 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -301,13 +301,13 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     isTable:false
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     isTable:false
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index 7f8cff2c0..6053c3c07 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -379,7 +379,7 @@ const submitForm = async (formType, submitData) => {
   })
   if (isExist) {
     // basicFormRef.value.formLoading = false
-    return message.warning('物料代码重复')
+    return message.warning('品番重复')
   }
   basicFormRef.value.formLoading = true
   try {
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index 90a1ff035..53ec78613 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -391,7 +391,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     tableForm: {
@@ -488,7 +488,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -498,7 +498,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false
   },
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -509,7 +509,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemName',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index 3ec168e0e..478811166 100644
--- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -329,7 +329,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -337,7 +337,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -345,7 +345,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -354,7 +354,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -701,7 +701,7 @@ export const DeliverRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue
index 726229bd0..55d7364b5 100644
--- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue
@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index e27f39d42..5022a75cf 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
index 46e69539a..a2bbda0f8 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@@ -543,7 +543,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
   // },
 
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -551,7 +551,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -559,7 +559,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -568,7 +568,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
index fec5b97f8..034448d7c 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
index b44e8459e..77c397b10 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@@ -407,7 +407,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
   //   hiddenInMain: true
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -415,7 +415,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -423,7 +423,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     // isSearch: true,
@@ -434,7 +434,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
 
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     // isSearch: true,
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index 7707a7642..357d5acd8 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -35,7 +35,7 @@
 
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -462,7 +462,7 @@ const submitForm = async (formType, submitData) => {
    if(rs.length > 1) isExist = true
   })
   if (isExist) {
-    return message.warning('物料代码重复')
+    return message.warning('品番重复')
   }
   data.subList.forEach(obj => {
     if(obj.qty == 0){
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index ab2fbf1e8..1de98e3b1 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -534,7 +534,7 @@ export const StockupDetailRequestRules = reactive({
     { required: true, message: '请选择计量单位', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   toLocationCode : [
     { required: true, message: '请选择到库代码', trigger: 'change' }
@@ -641,7 +641,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
   //   }
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -650,7 +650,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple:true,
       isInpuFocusShow: false, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'code',
       searchTitle: '物料基础信息',
       searchAllSchemas: Itembasic.allSchemas,
@@ -674,7 +674,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '物料基础信息',
         searchAllSchemas: Itembasic.allSchemas,
@@ -696,7 +696,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isTableForm: false,
@@ -705,7 +705,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     isTableForm: false,
@@ -715,7 +715,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     isTableForm: false,
diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index e403d426f..9e41f03af 100644
--- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -242,7 +242,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -250,7 +250,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -258,7 +258,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -267,7 +267,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -623,7 +623,7 @@ export const DeliverRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue
index 3fc3dd5e0..0cbcab91e 100644
--- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue
@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index bbdfff2e7..28fa956dd 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -7,13 +7,16 @@ import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplie
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 import { validatePositiveNumber } from "@/utils/validator";
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
 /**
  * @returns {Array} 库存余额
  */
 export const Balance = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -22,7 +25,7 @@ export const Balance = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -31,7 +34,17 @@ export const Balance = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料描述1',
+      label: '背番',
+      field: 'backNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenSearchHigh: true,// 高级筛选中隐藏
+      isSearch: true
+    },
+    {
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -41,7 +54,7 @@ export const Balance = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -431,6 +444,17 @@ export const Balance = useCrudSchemas(
         width: 150
       }
     },
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: false,
+      isSearch: true
+    },
     {
       label: '创建时间',
       field: 'createTime',
@@ -515,7 +539,7 @@ export const Balance = useCrudSchemas(
 export const BalancePopWindow = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -524,7 +548,7 @@ export const BalancePopWindow = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -533,7 +557,7 @@ export const BalancePopWindow = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -543,7 +567,7 @@ export const BalancePopWindow = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -733,7 +757,7 @@ export const TransactionTab = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -816,7 +840,7 @@ export const BalanceRules = reactive({
   //   { required: true, message: '请选择器具号', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
@@ -848,7 +872,7 @@ export const BalancePackageRules = reactive({
 })
 export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -881,22 +905,109 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0
     }
   },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '标包数量',
-    field: 'packQty',
-    sort: 'custom',
-    tableForm: {
-      disabled: true
-    }
-  },
+  // {
+  //   label: '包装规格',
+  //   field: 'packUnit',
+  //   sort: 'custom',
+  //   tableForm: {
+  //     disabled: true
+  //   }
+  // },
+  // {
+  //   label: '标包数量',
+  //   field: 'packQty',
+  //   sort: 'custom',
+  //   tableForm: {
+  //     disabled: true
+  //   }
+  // },
+   {
+          label: '包装规格',
+          field: 'packUnit',
+          sort: 'custom',
+          isSearch: false,
+          table: {
+            width: 120
+          },
+          isTable: false,
+          isTableForm: true,
+          isForm: true,
+          tableForm: {
+            enterSearch: true,
+            isInpuFocusShow: true,
+            isSearchList: true, // 开启查询弹窗
+            searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+            searchField: 'packUnit', // 查询弹窗赋值字段
+            searchTitle: '物料包装信息', // 查询弹窗标题
+            searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+            searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+            searchCondition: [
+              {
+                key: 'available',
+                value: 'TRUE',
+                isMainValue: false
+              },
+              {
+                key: 'itemCode',
+                value: 'itemCode',
+                message: '请先选择品番！',
+                isMainValue: true
+              }
+            ],
+            verificationParams: [
+              {
+                key: 'packUnit',
+                action: '==',
+                value: '',
+                isMainValue: false,
+                isSearch: true,
+                isFormModel: true
+              }
+            ] // 失去焦点校验参数
+          },
+          form: {
+            // labelMessage: '信息提示说明！！！',
+            componentProps: {
+              isSearchList: true, // 开启查询弹窗
+              searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+              searchField: 'packUnit', // 查询弹窗赋值字段
+              searchTitle: '物料包装信息', // 查询弹窗标题
+              searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+              searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+              searchCondition: [
+                {
+                  key: 'available',
+                  value: 'TRUE',
+                  isMainValue: false
+                },
+                {
+                  key: 'itemCode',
+                  value: 'itemCode',
+                  message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
+                  isMainValue: true
+                }
+              ],
+              verificationParams: [
+                {
+                  key: 'packUnit',
+                  action: '==',
+                  value: '',
+                  isMainValue: false,
+                  isSearch: true,
+                  isFormModel: true
+                }
+              ] // 失去焦点校验参数
+            }
+          }
+        },
+        {
+          label: '包装数量',
+          field: 'packQty',
+          sort: 'custom',
+          table: {
+            width: 150
+          }
+        },
   {
     label: '计量单位',
     field: 'uom',
@@ -915,7 +1026,7 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '标签生产线代码',
-    field: 'productionLineCodePackage',
+    field: 'productionLine',
     sort: 'custom',
     table: {
       width: 150
@@ -953,7 +1064,7 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
       searchCondition: [{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       }]
     }
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 74ed90f3d..d828cc2af 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -35,13 +35,13 @@
         <el-button
           :type="row.frozen == 'TRUE' || row.expireDate < dayjs().valueOf() ? 'danger' : 'primary'"
           link
-          @click="openDetail(row, '物料代码', row.itemCode)"
+          @click="openDetail(row, '品番', row.itemCode)"
         >
           <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -381,7 +381,8 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
   //   item.width = item.table?.width || 150
   // })
   // detatableData1.value = tableObjectPrint.tableList
-
+ tableObject.loading = true
+  try {
   await ItembasicApi.getItembasicPage({
     pageSize: 10,
     pageNo: 1,
@@ -392,19 +393,28 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
     if (res.list.length > 0) {
       // 判断物料 可采购
       detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules)
-      enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' : ''
+      // enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' : ''
+      if (res.list[0].enableBuy == "TRUE") {
+        if (res.list[0].type == 'TOOL') {
+          enableBuyOrenableMake.value = 'enableBuyTool'
+        } else {
+          enableBuyOrenableMake.value = 'enableBuy'
+        }
+      } else if (res.list[0].enableMake == "TRUE") {
+         enableBuyOrenableMake.value = 'enableMake'
+      }
       enableBuy.value = res.list[0].enableBuy
       enableMake.value = res.list[0].enableMake
 
     } else {
-      message.warning('没有查询到物料代码：【' + row.itemCode + '】')
+      message.warning('没有查询到品番：【' + row.itemCode + '】')
       return
     }
     
   })
   if (enableBuy.value == "TRUE" && enableMake.value == "FALSE") {
-    detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage')
-    delete detailListTableColumnsRules.value.productionLineCodePackage
+    detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLine')
+    delete detailListTableColumnsRules.value.productionLine
     // 修改 tableform 属性
     await SupplieritemApi.getSupplieritemPage({
       pageSize: 10,
@@ -431,8 +441,8 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
       by: 'ASC',
     }).then(response => {
       detailListTableColumns.tableFormColumns.map(itemColumns => {
-        if(itemColumns.field == 'productionLineCodePackage') {
-          row.productionLineCodePackage = response?.list[0]?.productionLineCode
+        if(itemColumns.field == 'productionLine') {
+          row.productionLine = response?.list[0]?.productionLineCode
         }
       })
     })
@@ -455,14 +465,21 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
   })
     console.log(1111)
  
-  labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
+    labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
+   } finally {
+    tableObject.loading = false
+  }
 }
 
 // 批量打印--预生产收货
 const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
   if (type == 'tableForm') {
-    
+    // row[formField] = val[0][searchField]
+    if (formField === 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
   } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -544,7 +561,7 @@ const searchFormClick = (searchData) => {
 const changeTabs = (item) => {
   if (item.prop == 'Transaction') {
     tabsExtend.value = true
-    // 当前物料代码作为条件
+    // 当前品番作为条件
     tableObjectExtend.value = [
       {
         key: 'masterId',
@@ -576,6 +593,7 @@ const footButtonClick = async (val) => {
     labelPointFormRef.value.dialogVisible = false
   }
 }
+// 打印标签
 const pointLabel = async () => {
   // const array =detatableData1.value.map(item=>{
   //   return {
@@ -593,7 +611,7 @@ const pointLabel = async () => {
     packUnit:detatableData1.value[0].packUnit,
     packQty:detatableData1.value[0].packQty,
     uom:detatableData1.value[0].uom,
-    productionLineCodePackage:detatableData1.value[0].productionLineCodePackage,
+    productionLine:detatableData1.value[0].productionLine,
     supplierCode:detatableData1.value[0].supplierItemCode,
   }
   // const isHave = detatableData1.value.find(item => parseFloat(item.printQty) <= 0)
@@ -604,8 +622,9 @@ const pointLabel = async () => {
   await PackageApi.batchPrintingBalanceLableForCreate(obj).then(res => {
     let src =ref('')
     // src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板
-
-     if (enableBuyOrenableMake.value == 'enableBuy') {
+    if (enableBuyOrenableMake.value == 'enableBuyTool') {
+       src.value = BASE_URL + '/jmreport/view/1027757375736582144?token=' + getAccessToken()+'&asn_number='+res//采购标签协定品模板
+    } else  if (enableBuyOrenableMake.value == 'enableBuy') {
       src.value = BASE_URL + '/jmreport/view/1022349139354537984?token=' + getAccessToken()+'&asn_number='+res//采购标签模板
     } else if(enableBuyOrenableMake.value == 'enableMake') {
      src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板
diff --git a/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
index 452c19a7e..87e864cef 100644
--- a/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
+++ b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
@@ -9,7 +9,7 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item
 export const BalanceSummarySearch = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -20,7 +20,7 @@ export const BalanceSummarySearch = useCrudSchemas(
         componentProps: {
           enterSearch: true, //可输入回车
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -41,7 +41,7 @@ export const BalanceSummarySearch = useCrudSchemas(
         }
       }
     },{
-      label: '物料描述',
+      label: '描述',
       field: 'desc1',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/inventoryManage/container/containerMain.data.ts b/src/views/wms/inventoryManage/container/containerMain.data.ts
index 32b728b0b..61f52731d 100644
--- a/src/views/wms/inventoryManage/container/containerMain.data.ts
+++ b/src/views/wms/inventoryManage/container/containerMain.data.ts
@@ -87,7 +87,7 @@ export const ContainerDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryManage/container/index.vue b/src/views/wms/inventoryManage/container/index.vue
index 6102a66ba..13efc7aaf 100644
--- a/src/views/wms/inventoryManage/container/index.vue
+++ b/src/views/wms/inventoryManage/container/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
index 8bd5d3662..8c3d9811b 100644
--- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
@@ -94,7 +94,7 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
index 004f6afb9..e162116dc 100644
--- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
index 17161c99c..c29f9aa8b 100644
--- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
index 7c1576fca..4fcfa204c 100644
--- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
@@ -93,7 +93,7 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
index e25e285eb..e48c69351 100644
--- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts
index 1f8bedba3..406b2c884 100644
--- a/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts
@@ -200,7 +200,7 @@ export const ContainerDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
index 020a5d083..e032221ca 100644
--- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
index 7c0826168..4932c0387 100644
--- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryManage/expectin/expectin.data.ts b/src/views/wms/inventoryManage/expectin/expectin.data.ts
index 5c8d1f4ac..e4cf9f8ca 100644
--- a/src/views/wms/inventoryManage/expectin/expectin.data.ts
+++ b/src/views/wms/inventoryManage/expectin/expectin.data.ts
@@ -22,7 +22,7 @@ export const Expectin = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -182,7 +182,7 @@ export const ExpectinRules = reactive({
     { required: true, message: '请选择业务类型', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue
index f372f35b3..b4203d770 100644
--- a/src/views/wms/inventoryManage/expectin/index.vue
+++ b/src/views/wms/inventoryManage/expectin/index.vue
@@ -36,7 +36,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryManage/expectout/expectout.data.ts b/src/views/wms/inventoryManage/expectout/expectout.data.ts
index 4d9447e77..919c9e7e6 100644
--- a/src/views/wms/inventoryManage/expectout/expectout.data.ts
+++ b/src/views/wms/inventoryManage/expectout/expectout.data.ts
@@ -22,7 +22,7 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -193,7 +193,7 @@ export const ExpectoutRules = reactive({
     { required: true, message: '请选择包装号', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue
index 73df20786..5e764a4b7 100644
--- a/src/views/wms/inventoryManage/expectout/index.vue
+++ b/src/views/wms/inventoryManage/expectout/index.vue
@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index 4499c4263..de25d59ad 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -35,7 +35,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -366,6 +366,18 @@ const handlePoint = async (row) => {
       //制造标签
       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value+'&asn_number='+res.zzLabel)
+    }
+     if(res.xdpLabel){
+       //协定品标签
+      // const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      // window.open(src.value+'&asn_number='+res.cgLabel)
+       PackageApi.getPrintingLableId({packingNumbers:[row.number]}).then(res => {
+        console.log(res)
+        window.open(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()+'&id=' + res)
+      }).catch(err => {
+        console.log(err)
+        message.error('创建标签失败')
+      })
     }
     if (res.cgLabel) {
       //采购标签
@@ -379,7 +391,7 @@ const handlePoint = async (row) => {
         message.error('创建标签失败')
       })
     }
-    if(!res.cgLabel&&!res.zzLabel){
+    if(!res.cgLabel&&!res.zzLabel&&!res.xdpLabel){
       message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!')
     }
   }).catch(err => {
diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts
index a8d1f6955..3a9ab3a08 100644
--- a/src/views/wms/inventoryManage/package/package.data.ts
+++ b/src/views/wms/inventoryManage/package/package.data.ts
@@ -45,18 +45,18 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm:false
   },
+  // {
+  //   label: '父包装号',
+  //   field: 'parentNumber',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   isForm: false,
+  //   table: {
+  //     width: 180,
+  //   },
+  // },
   {
-    label: '父包装号',
-    field: 'parentNumber',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-    table: {
-      width: 180,
-    },
-  },
-  {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -67,7 +67,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -90,7 +90,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -98,7 +98,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -111,7 +111,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -252,28 +252,32 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '替代计量单位',
-    field: 'altUom',
+    label: '采购计量单位',
+    field: 'purchaseUom',
     sort: 'custom',
     dictType: DICT_TYPE.UOM,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'SelectV2',
-      componentProps: {
-        disabled: true
-      }
-    },
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     table: {
-      width: 150,
+      width: 120
     },
   },
   {
-    label: '替代数量',
-    field: 'altQty',
+    label: '采购数量',
+    field: 'purchaseQty',
+    table: {
+      width: 120
+    },
     sort: 'custom',
+  },
+  {
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
     table: {
-      width: 150,
+      width: 120
     },
+    sort: 'custom',
   },
   {
     label: '转换率',
@@ -301,7 +305,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
         enterSearch:true,
         isSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'packUnit',
         searchTitle: '物料包装信息',
         searchAllSchemas: Itempackaging.allSchemas,
@@ -313,7 +317,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key:'itemCode', // 查询列表中字段
           value:'itemCode', // 指主表某字段
-          message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
+          message: '请选择品番！', // 当前置条件为空时 弹出信息提示
           isMainValue: true, // 表示查询条件是主表的字段的值
           action: '==', // 查询拼接条件
         }],
@@ -435,7 +439,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch:true,
         isInpuFocusShow: true,
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'supplierCode', // 查询弹窗赋值字段
         searchTitle: '供应商物料信息',
         isSearchList: true, // 开启查询弹窗
@@ -444,7 +448,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition:[{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         }],
         verificationParams: [
@@ -462,7 +466,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '供应商物料代码',
+    label: '供应商品番',
     field: 'supplierItemCode',
     sort: 'custom',
     table: {
@@ -486,7 +490,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
         //   },{
         //     key: 'supplierCode',
         //     value: 'supplierCode',
-        //     message: '请填写物料代码！',
+        //     message: '请填写品番！',
         //     isMainValue: true
         //   }
         // ],
@@ -626,7 +630,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   // {
-  //   label: '客户物料代码',
+  //   label: '客户品番',
   //   field: 'customerItemCode',
   //   sort: 'custom',
   //   table: {
diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts
index 961e6bf1d..b59d93d93 100644
--- a/src/views/wms/inventoryManage/transaction/transaction.data.ts
+++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts
@@ -90,7 +90,7 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -447,7 +447,7 @@ export const TransactionRules = reactive({
     { required: true, message: '请选择生效时间', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
diff --git a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
index 26b8967e4..9f20592e5 100644
--- a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
+++ b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
@@ -47,7 +47,7 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -448,6 +448,6 @@ export const TransferlogRules = reactive({
     { required: true, message: '请选择生效时间', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
index 21de35179..6177df724 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
@@ -36,7 +36,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -211,20 +211,25 @@ const handleSelectionPoint = async ()=>{
     text: 'loading...',
     background: 'rgba(0, 0, 0, 0.7)'
   })
-  InventoryinitRecordDetailApi.printLabelBatchByIdSelection(rows.join(",")).then(res => {
+  InventoryinitRecordDetailApi.printLabelBatchByIdSelectionForYT(rows.join(",")).then(res => {
     console.log('批量打印res',res);
     getLoading?.close()
     if(res.zzLabel){
       //制造标签
       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value+'&asn_number='+res.zzLabel)
+    }
+     if(res.xdpLabel){
+      //协定品标签
+      const src = ref(BASE_URL + '/jmreport/view/1027757375736582144?token=' + getAccessToken())
+      window.open(src.value+'&asn_number='+res.xdpLabel)
     }
     if (res.cgLabel) {
       //采购标签
-      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/1022349139354537984?token=' + getAccessToken())
       window.open(src.value+'&asn_number='+res.cgLabel)
     }
-    if(!res.cgLabel&&!res.zzLabel){
+    if(!res.cgLabel&&!res.zzLabel&&!res.xdpLabel){
       message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!')
     }
   }).catch(err => {
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
index cd35ea0dd..ffa434e11 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
@@ -330,7 +330,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -338,7 +338,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -346,7 +346,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -354,7 +354,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -682,7 +682,7 @@ export const InventoryinitRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 71d4d6103..07173a8c8 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -116,7 +116,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if(formField=='itemCode'){
-        //物料代码
+        //品番
         let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code']))
         if(itemCodes.length>0){
           itemCodes = itemCodes.map(item=>(item['code']))
@@ -164,7 +164,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
     if(formField=='itemCode'){
-        //物料代码
+        //品番
         setV['uom'] = val[0]['uom']
       }else if(formField=='packUnit'){
         //包装规格1
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 4efe6f01b..fcceafdf4 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -406,7 +406,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -415,7 +415,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     tableForm:{
       multiple:true,
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'code',
       searchTitle: '物料基础信息',
       searchAllSchemas: Itembasic.allSchemas,
@@ -440,7 +440,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'code',
         searchTitle: '物料基础信息',
         searchAllSchemas: Itembasic.allSchemas,
@@ -454,7 +454,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -464,7 +464,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -474,7 +474,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1217,7 +1217,7 @@ export const InventoryinitRequestDetailRules = reactive({
     { required: true, message: '请选择库位代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
index 95bc2f273..0f378beb1 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
index 2e4e8f15a..182924ce8 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
@@ -351,7 +351,7 @@ export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -359,7 +359,7 @@ export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -367,7 +367,7 @@ export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -375,7 +375,7 @@ export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
index bff991355..5c1ba1bbc 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
index ac2a6c853..410f362c7 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
@@ -567,7 +567,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -575,7 +575,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -583,7 +583,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -591,7 +591,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
index e54e6a66c..768fbedec 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
index 2520fdb25..a714be3f5 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@@ -280,7 +280,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -288,7 +288,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -296,7 +296,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -304,7 +304,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
index 6e7ae6876..09fbd3265 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
index c857a62a2..a1b25eb86 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -454,7 +454,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -464,7 +464,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -486,7 +486,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple:true,
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -506,7 +506,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -516,7 +516,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -526,7 +526,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -637,7 +637,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+          message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
           isMainValue: true
           }],
         // 失去焦点校验参数
@@ -676,7 +676,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       },{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+        message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
         isMainValue: true
         }],
       // 失去焦点校验参数
@@ -964,7 +964,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
 // 表单校验
 export const PackageoverRequestDetailRules = reactive({
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   fromPackUnit: [
     { required: true, message: '请选择从包装规格', trigger: 'change' }
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
index 398c6d52c..28a39295d 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="[defaultButtons.mainListPointBtn(null)]" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="[defaultButtons.mainListPointBtn(null)]" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
index 425317c2c..d5be744cc 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
@@ -64,7 +64,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -73,7 +73,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -81,7 +81,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -89,7 +89,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
index cb9b89898..9cebc76d2 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
index 7b1f4597b..3d644d119 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
@@ -352,7 +352,7 @@ export const PackagesplitDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // }, 
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -360,7 +360,7 @@ export const PackagesplitDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -368,7 +368,7 @@ export const PackagesplitDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -376,7 +376,7 @@ export const PackagesplitDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
index 6c3d5aa35..5e789b321 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 5c91579a9..1066eaf5b 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -823,7 +823,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -831,7 +831,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -839,7 +839,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -847,7 +847,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1006,7 +1006,7 @@ export const ScrapJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
index c76298be3..63c6188e8 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index c7d9d4b39..1cb0b24b1 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -606,7 +606,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -614,7 +614,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -622,7 +622,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -630,7 +630,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -858,7 +858,7 @@ export const ScrapRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 9cb319fb5..0ffdcee0b 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index f1dee42d1..06e20027a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -1025,7 +1025,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1036,7 +1036,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1049,7 +1049,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1059,7 +1059,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1423,7 +1423,7 @@ export const ScrapRequestDetailRules = reactive({
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue
index 5f42c89bb..3cabd6cbe 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts
index 660fbb2e3..ff9132d02 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts
@@ -523,7 +523,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -531,7 +531,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -539,7 +539,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -547,7 +547,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
index 23097f9f1..ad9d0e556 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
index 62fe54e2d..3369dc993 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
@@ -693,7 +693,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -702,7 +702,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     tableForm:{
       multiple:true,//多选
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',// 输入框占位文本
+      searchListPlaceholder: '请选择品番',// 输入框占位文本
       searchField: 'code',// 查询弹窗赋值字段
       searchTitle: '物料基础信息',
       searchAllSchemas: Itembasic.allSchemas,
@@ -789,7 +789,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     form: {
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -874,7 +874,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -884,7 +884,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -894,7 +894,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1469,7 +1469,7 @@ export const UnplannedreceiptRequestDetailRules = reactive({
     { validator:validateQty, message: '数量必须大于0', trigger: 'change'}
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -1491,7 +1491,7 @@ export const UnplannedreceiptRequestDetailRules = reactive({
  */
 export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1507,7 +1507,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1517,7 +1517,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1527,7 +1527,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1726,7 +1726,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
           {
             key: 'itemCode',
             value: 'itemCode',
-            message: '请选择物料代码',
+            message: '请选择品番',
             isMainValue: true
           },
           {
@@ -1751,7 +1751,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
         {
           key: 'itemCode',
           value: 'itemCode',
-          message: '请选择物料代码',
+          message: '请选择品番',
           isTableRowValue: true, 
           isMainValue:false
         },
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
index 401b48728..6a94e8f05 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/sparepartsrequisitionJobMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/sparepartsrequisitionJobMain.data.ts
index 97c7a1e97..3423ff191 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/sparepartsrequisitionJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/sparepartsrequisitionJobMain.data.ts
@@ -732,7 +732,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -740,7 +740,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -748,7 +748,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -756,7 +756,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -903,7 +903,7 @@ export const UnplannedissueJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
index a1fb6bb8a..238057ac3 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
index fbe9c7036..8609c3207 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
@@ -546,7 +546,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -554,7 +554,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -562,7 +562,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -570,7 +570,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -800,7 +800,7 @@ export const UnplannedissueRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 8715bded9..7429b6541 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
index 7ce36142e..f10715bcb 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@@ -598,7 +598,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -664,7 +664,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -674,7 +674,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -684,7 +684,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -946,7 +946,7 @@ export const UnplannedissueRequestDetailRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' },
+    { required: true, message: '请选择品番', trigger: 'change' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark:  [
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
index cb0876240..0c74f5ea5 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
index 2ecad62c4..bc91ac156 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
@@ -650,7 +650,7 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -658,7 +658,7 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -666,7 +666,7 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -674,7 +674,7 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -862,7 +862,7 @@ export const TransferissueJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
index db4a3e3d7..974fb298c 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
index 04d5e3e02..d030515a6 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
@@ -424,7 +424,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -432,7 +432,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -440,7 +440,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -448,7 +448,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -731,7 +731,7 @@ export const TransferissueRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index 5e5e6debe..7758fed45 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 436aca40f..687d8fb28 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -622,7 +622,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -633,7 +633,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -643,7 +643,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -653,7 +653,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1027,7 +1027,7 @@ export const TransferissueRequestDetailRules = reactive({
     { required: true, message: '请选择到库位代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
index 924ce6e1c..60111b5c6 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
index ea2dc1572..b2db9c78c 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
@@ -650,7 +650,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -658,7 +658,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -666,7 +666,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -674,7 +674,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -863,7 +863,7 @@ export const TransferreceiptJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
index ee7aee182..84ff278bf 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
index bbc5e5fb9..5bda84449 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
@@ -433,7 +433,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -441,7 +441,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -449,7 +449,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -457,7 +457,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -732,7 +732,7 @@ export const TransferreceiptRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
index baffa33d7..47941d63c 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index 8c372733c..219e5162d 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -462,7 +462,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -470,7 +470,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -478,7 +478,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -486,7 +486,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -713,6 +713,6 @@ export const TransferreceiptRequestDetailRules = reactive({
     { required: true, message: '请选择从库位代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
index 86cbdaee2..d0ad6a1fe 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
index 2ef58ae5f..b48205f26 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
@@ -784,7 +784,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -792,7 +792,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -800,7 +800,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -808,7 +808,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -970,7 +970,7 @@ export const UnplannedissueJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
index 82cfb8735..4c66d9303 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index 115e2e4eb..098bf79f7 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -600,7 +600,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -608,7 +608,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -616,7 +616,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -624,7 +624,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -872,7 +872,7 @@ export const UnplannedissueRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 6ca14b654..26728daa6 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 7815034fd..4c9dfe432 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -704,7 +704,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -772,7 +772,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -782,7 +782,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -792,7 +792,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1162,7 +1162,7 @@ export const UnplannedissueRequestDetailRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' },
+    { required: true, message: '请选择品番', trigger: 'change' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   qty:[
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
index 3eeb8277c..f47f3e371 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
index 2c03ba4f8..cb9863a41 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@@ -770,7 +770,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -778,7 +778,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -786,7 +786,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -794,7 +794,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1090,7 +1090,7 @@ export const UnplannedreceiptJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
index 04eab44c5..d2e77787a 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index c197baeb7..bd25c7de0 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -581,7 +581,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -589,7 +589,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -597,7 +597,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -605,7 +605,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 1c12643de..68b6e62ab 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -551,83 +551,90 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'cjbq') {
     // 创建标签
     // 判断 是否已创建标签
-    let isCreateLabel = false
-    await PackageApi.getPackagePage({
-      requestNumber: row.number
-    }).then((res) => {
-      if (res) {
-        if (res.list.length > 0) isCreateLabel = true
+    tableObject.loading = true
+    try {
+       let isCreateLabel = false
+      await PackageApi.getPackagePage({
+        requestNumber: row.number
+      }).then((res) => {
+        if (res) {
+          if (res.list.length > 0) isCreateLabel = true
+        }
+      })
+      if (isCreateLabel) {
+        message.warning('已创建过标签！！！')
+      tableObject.loading = false
+        return
       }
-    })
-    if (isCreateLabel) {
-      message.warning('已创建过标签！！！')
-      return
-    }
-    console.log('列表-操作按钮事件-创建标签')
-    detatableData.params = {
-      masterId: row.masterId
-    }
-    await getDetailList()
-    // 判断 是否已创建标签
-    if (detatableData.tableList[0].packingNumber) {
-      message.warning('已创建过标签！！！')
-      return
-    }
-    // 打开创建标签页面
-    // dialogVisible.value = true
-    formLabelRef.value.open('create', row)
-    
-        console.log(detailListTableColumns.tableFormColumns)
-    detatableData.tableList.map((item) => {
-      if (item.itemType == '可采购') {
-        item.disabled_productionLineCode = true
-        item.disabled_supplierCode = false
-        // 修改 tableform 属性
-        SupplieritemApi.getSupplieritemPage({
-          pageSize: 10,
-          pageNo: 1,
-          itemCode: item.itemCode,
-          sort: '',
-          by: 'ASC'
-        }).then((response) => {
-          detailListTableColumns.tableFormColumns.map((itemColumns) => {
-            if (itemColumns.field == 'supplierCode') {
-              item.supplierCode = response?.list[0]?.supplierCode
-            }
+      console.log('列表-操作按钮事件-创建标签')
+      detatableData.params = {
+        masterId: row.masterId
+      }
+      await getDetailList()
+      // 判断 是否已创建标签
+      if (detatableData.tableList[0].packingNumber) {
+        message.warning('已创建过标签！！！')
+        return
+      }
+      // 打开创建标签页面
+      // dialogVisible.value = true
+     tableObject.loading = false
+      formLabelRef.value.open('create', row)
+      console.log(detailListTableColumns.tableFormColumns)
+      detatableData.tableList.map((item) => {
+        if (item.itemType == '可采购') {
+          item.disabled_productionLineCode = true
+          item.disabled_supplierCode = false
+          // 修改 tableform 属性
+          SupplieritemApi.getSupplieritemPage({
+            pageSize: 10,
+            pageNo: 1,
+            itemCode: item.itemCode,
+            sort: '',
+            by: 'ASC'
+          }).then((response) => {
+            detailListTableColumns.tableFormColumns.map((itemColumns) => {
+              if (itemColumns.field == 'supplierCode') {
+                item.supplierCode = response?.list[0]?.supplierCode
+              }
+            })
           })
-        })
-      } else if (item.itemType == '可制造') {
-        item.disabled_supplierCode = true
-        item.disabled_productionLineCode = false
-        ProductionlineitemApi.getProductionlineitemPage({
-          pageNo: 1,
-          itemCode: item.itemCode,
-          sort: '',
-          by: 'ASC'
-        }).then((response) => {
-          detailListTableColumns.tableFormColumns.map((itemColumns) => {
-            if (itemColumns.field == 'productionLineCode') {
-              item.productionLineCode = response?.list[0]?.productionLineCode
+        } else if (item.itemType == '可制造') {
+          item.disabled_supplierCode = true
+          item.disabled_productionLineCode = false
+          ProductionlineitemApi.getProductionlineitemPage({
+            pageNo: 1,
+            itemCode: item.itemCode,
+            sort: '',
+            by: 'ASC'
+          }).then((response) => {
+            detailListTableColumns.tableFormColumns.map((itemColumns) => {
+              if (itemColumns.field == 'productionLineCode') {
+                item.productionLineCode = response?.list[0]?.productionLineCode
+              }
+            })
+          })
+        }
+        ruleApi
+          .getManagementPrecision({
+            itemCodes: [item['itemCode']],
+            locationCode: item['toLocationCode']
+          })
+          .then((res) => {
+            fromManagementPrecision.value = res[0].ManagementPrecision
+            if (fromManagementPrecision.value == 'BY_QUANTITY') {
+              item.batch = formatDate(new Date(), 'YYYYMMDD')
+              item['disabled_batch'] = false
+            } else {
+              item['disabled_batch'] = true
             }
           })
-        })
-      }
-      ruleApi
-        .getManagementPrecision({
-          itemCodes: [item['itemCode']],
-          locationCode: item['toLocationCode']
-        })
-        .then((res) => {
-          fromManagementPrecision.value = res[0].ManagementPrecision
-          if (fromManagementPrecision.value == 'BY_QUANTITY') {
-            item.batch = formatDate(new Date(), 'YYYYMMDD')
-            item['disabled_batch'] = false
-          } else {
-            item['disabled_batch'] = true
-          }
-        })
-    })
+      })
+    }finally {
+      tableObject.loading = false
+    }
   }
+   
 }
 
 /** 关闭按钮操作 */
@@ -945,21 +952,25 @@ const searchFormClick = (searchData) => {
 // 创建标签
 const submitFormLabel = async (formType, data) => {
   try {
+    formLabelRef.value.formLoading = true
     detatableData.tableList.forEach(async (item) => {
       await PackageApi.createPackageLabel(item)
         .then((res) => {
           isCreateLabel.value = true
           message.success('创建标签成功')
+          formLabelRef.value.formLoading = false
+          formLabelRef.value.dialogVisible = false
         })
         .catch((err) => {
           isCreateLabel.value = false
+          formLabelRef.value.formLoading = false
           console.log(err)
           message.error('创建标签失败')
         })
     })
   } finally {
-    formLabelRef.value.formLoading = false
-    formLabelRef.value.dialogVisible = false
+    // formLabelRef.value.formLoading = false
+    // formLabelRef.value.dialogVisible = false
   }
 }
 
@@ -1032,58 +1043,56 @@ const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
 const labelPrint = async (row) => {
   // 查询是否已创建过标签
-  await PackageApi.getPackagePage({
-    requestNumber: row.number
-  })
-    .then((res) => {
+  tableObject.loading = true
+  try {
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then((res) => {
       if (res.list.length > 0) {
         isCreateLabel.value = true
       } else {
         isCreateLabel.value = false
       }
-    })
-    .catch((err) => {
+    }).catch((err) => {
       isCreateLabel.value = false
       console.log(err)
     })
-  // 判断是采购还是制造
-  if (isCreateLabel.value) {
-    // labelPrint(row)
-    await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then((res) => {
-    if (res.length > 0) {
-      const itemType = res.some((item) => item.itemType == '可采购')
-      const itemType1 = res.some((item) => item.itemType == '可制造')
-      if (itemType) {
-        window.open(
-          BASE_URL +
-            '/jmreport/view/1016234988731322368?token=' +
-            getAccessToken() +
-            '&request_number=' +
-            row.number
-        )
-      }
-      if (itemType1) {
-        // window.open(src.value + '&request_number=' + row.number)
-        PackageApi.batchPrintingLableForYT(row.number)
-          .then((res) => {
-            console.log(res)
-            const src = ref(
-              BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
-            )
-            window.open(src.value + '&asn_number=' + res)
-          })
-          .catch((err) => {
-            console.log(err)
-            message.error('创建标签失败')
-          })
+    // 判断是采购还是制造
+    if (isCreateLabel.value) {
+      // labelPrint(row)
+      await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then(async (res) => {
+        if (res.length > 0) {
+          const itemType = res.some((item) => item.itemType == '可采购' && item.itemBasicType =='TOOL')//跳转协定品标签
+          const itemType2 = res.some((item) => item.itemType == '可采购' && item.itemBasicType !='TOOL')
+          const itemType1 = res.some((item) => item.itemType == '可制造')
+          if (itemType) {
+            window.open( BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken() + '&request_number=' + row.number )
+          }
+          if (itemType2) {
+            window.open( BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken() + '&request_number=' + row.number )
+          }
+        if (itemType1) {
+          // window.open(src.value + '&request_number=' + row.number)
+          await PackageApi.batchPrintingLableForYT(row.number).then((res) => {
+              console.log(res)
+              const src = ref(
+                BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
+              )
+              window.open(src.value + '&asn_number=' + res)
+            })
+            .catch((err) => {
+              console.log(err)
+              message.error('创建标签失败')
+            })
+        }
       }
-    }
-  })
+    })
   } else {
     message.warning('请先创建标签')
   }
-
-  
+  } finally {
+    tableObject.loading = false
+  }
   // window.open(src.value + '&request_number=' + row.number)
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index d6d1806f3..6ceef2caa 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -527,26 +527,26 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '是否直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: true,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'FALSE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
-  },
+  // {
+  //   label: '是否直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isForm: true,
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'FALSE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
   {
     label: '单据备注',
     field: 'remarkMain',
@@ -707,7 +707,7 @@ export const ItembasicShow = useCrudSchemas(
       },
     },
     {
-      label: '描述1',
+      label: '背番',
       field: 'desc1',
       sort: 'custom',
       table: {
@@ -715,7 +715,7 @@ export const ItembasicShow = useCrudSchemas(
       // isTableForm:false
     },
     {
-      label: '描述2',
+      label: '描述',
       field: 'desc2',
       sort: 'custom',
       table: {
@@ -787,7 +787,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -796,7 +796,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     tableForm:{
       multiple:true,//多选
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',// 输入框占位文本
+      searchListPlaceholder: '请选择品番',// 输入框占位文本
       searchField: 'code',// 查询弹窗赋值字段
       searchTitle: '物料基础信息',
       searchAllSchemas: ItembasicShow.allSchemas,
@@ -828,7 +828,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     form: {
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -858,7 +858,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -868,7 +868,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -878,7 +878,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1050,6 +1050,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         value: 'in',
         isMainValue: false
         }],
+      isRepeat: true,
       verificationParams: [{
         key: 'code',
         action: '==',
@@ -1455,7 +1456,7 @@ export const UnplannedreceiptRequestDetailRules = reactive({
     { validator:validateQty, message: '数量必须大于0', trigger: 'change'}
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -1477,7 +1478,7 @@ export const UnplannedreceiptRequestDetailRules = reactive({
  */
 export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1493,7 +1494,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1503,7 +1504,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1513,7 +1514,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1705,7 +1706,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     table: {
       width: 150,
       componentProps: {
-        disabled: true,
         isSearchList: true,
         searchListPlaceholder: '请选择包装',
         searchField: 'packUnit',
@@ -1716,7 +1716,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
           {
             key: 'itemCode',
             value: 'itemCode',
-            message: '请选择物料代码',
+            message: '请选择品番',
             isMainValue: true
           },
           {
@@ -1730,7 +1730,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     },
     tableForm: {
       enterSearch:true,
-      disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
       searchField: 'packUnit',
@@ -1741,7 +1740,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
         {
           key: 'itemCode',
           value: 'itemCode',
-          message: '请选择物料代码',
+          message: '请选择品番',
           isTableRowValue: true, 
           isMainValue:false
         },
@@ -1759,14 +1758,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     table: {
       width: 150
     },
-    form: {
-      componentProps: {
-        disabled: true,
-      }
-    },
-    tableForm: {
-      disabled: true,
-    }
   },
   {
     label: '标签生产线代码',
@@ -1808,7 +1799,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       searchCondition: [{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       }]
     }
diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
index 722dce117..229f3a99a 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 16b89d90f..3861c542d 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -212,6 +212,16 @@ export const IssueJobMain = useCrudSchemas(
         component: 'InputNumber'
       }
     },
+    {
+      label: '备料计划单据号',
+      field: 'preparetoissuePlanNumber',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '部门',
       field: 'departmentCode',
@@ -627,7 +637,7 @@ export const IssueJobMain = useCrudSchemas(
       isDetail: false,
       isForm: false,
       table: {
-        width: 120,
+        width: 200,
         fixed: 'right'
       }
     }
@@ -663,7 +673,7 @@ export const IssueJobMainRules = reactive({
 export const IssueJobDetail = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -674,7 +684,7 @@ export const IssueJobDetail = useCrudSchemas(
       sortTableDefault: 3
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -682,6 +692,27 @@ export const IssueJobDetail = useCrudSchemas(
       },
       sortTableDefault: 3
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false,
+      isSearch: true,
+      sortTableDefault: 3,
+      sortSearchDefault: 2,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '数量',
       field: 'qty',
@@ -814,7 +845,7 @@ export const IssueJobDetail = useCrudSchemas(
       hiddenInMain: true
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -823,7 +854,7 @@ export const IssueJobDetail = useCrudSchemas(
       hiddenInMain: true
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -1032,7 +1063,7 @@ export const IssueJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
index 31130ca53..530f99d33 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index 2e9e0871e..622ffb570 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -208,7 +208,16 @@ export const IssueRecordMain = useCrudSchemas(
       },
       isTable: false
     },
-
+    {
+      label: '备料计划单据号',
+      field: 'preparetoissuePlanNumber',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '最后更新时间',
       field: 'updateTime',
@@ -405,7 +414,7 @@ export const IssueRecordMainRules = reactive({
 export const IssueRecordDetail = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -416,7 +425,7 @@ export const IssueRecordDetail = useCrudSchemas(
       sortTableDefault: 4
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -424,6 +433,37 @@ export const IssueRecordDetail = useCrudSchemas(
       },
       sortTableDefault: 4
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      isSearch:true,
+      table: {
+        width: 150
+      },
+      sortTableDefault: 4
+    },
+    // {
+    //   label: '背番',
+    //   field: 'itemDesc1',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTableForm: false,
+    //   isForm: false,
+    //   isSearch: true,
+    //   sortTableDefault: 4,
+    //   sortSearchDefault: 2,
+    //   tableForm: {
+    //     disabled: true
+    //   },
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   }
+    // },
     {
       label: '数量',
       field: 'qty',
@@ -446,7 +486,7 @@ export const IssueRecordDetail = useCrudSchemas(
       sortTableDefault: 9
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -455,7 +495,7 @@ export const IssueRecordDetail = useCrudSchemas(
       hiddenInMain: true
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -874,7 +914,7 @@ export const IssueRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index c2246c291..638be60f3 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -195,6 +195,7 @@ const getDefaultPackUnit = async (packUnitList)=>{
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
+    debugger
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {
@@ -215,6 +216,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             productionLineCode:formRef.formModel['productionLineCode'],//生产线代码
             workStationCode:formRef.formModel['workStationCode'],//工位代码
           })
+          newRow['itemDesc1'] = item['backNumber']//物料描述1赋值到背番
           tableData.value.push(newRow)
         })
         getDefaultPackUnit(packUnitList)
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 1442d37b7..ca5960d0c 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -319,6 +319,16 @@ export const IssueRequestMain = useCrudSchemas(
         value: '1'
       }
     },
+    {
+      label: '备料计划单据号',
+      field: 'preparetoissuePlanNumber',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '从库区类型范围',
       field: 'fromAreaTypes',
@@ -826,7 +836,7 @@ export const IssueRequestDetail = useCrudSchemas(
       isForm: false
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -841,7 +851,7 @@ export const IssueRequestDetail = useCrudSchemas(
         disabled:true,
         // isInpuFocusShow: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -889,7 +899,7 @@ export const IssueRequestDetail = useCrudSchemas(
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '物料信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -905,7 +915,7 @@ export const IssueRequestDetail = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -915,6 +925,46 @@ export const IssueRequestDetail = useCrudSchemas(
       isTableForm: false,
       isForm: false
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false,
+      isSearch: true,
+      sortTableDefault: 4,
+      sortSearchDefault: 5,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      isSearch: true,
+  isForm:false,
+  hiddenSearchHigh:true,
+      table: {
+        width: 150
+      },
+  form:{
+        componentProps:{
+          disabled: true,
+        }
+      },
+      tableForm: {
+        disabled: true
+      },
+    },
     {
       label: '包装规格',
       field: 'packUnit',
@@ -936,7 +986,7 @@ export const IssueRequestDetail = useCrudSchemas(
         },{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
           }]
       }
@@ -958,7 +1008,7 @@ export const IssueRequestDetail = useCrudSchemas(
       //     },{
       //       key: 'itemCode',
       //       value: 'itemCode',
-      //       message: '请填写物料代码！',
+      //       message: '请填写品番！',
       //       isMainValue: true
       //       }],
       //     verificationParams: [{
@@ -1071,7 +1121,7 @@ export const IssueRequestDetail = useCrudSchemas(
       isForm: false
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -1082,7 +1132,7 @@ export const IssueRequestDetail = useCrudSchemas(
       isForm: false
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -1289,7 +1339,7 @@ export const IssueRequestDetailRules = reactive({
   //   { required: true, message: '请选择工位代码', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   packingNumber: [
     { required: true, message: '请输入包装号', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
index 54e593df5..95fb5dd4b 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
index 80e614380..179927c98 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
@@ -334,7 +334,7 @@ export const OnlinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -342,7 +342,7 @@ export const OnlinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -350,7 +350,7 @@ export const OnlinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -358,7 +358,7 @@ export const OnlinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
index 1c93ba061..dfa03ebfa 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
index 559ab0459..0377b5513 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
@@ -49,7 +49,7 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     },
     isSearch: true,
     form: {
-      labelMessage: '该记录中物料代码、供应商代码会影响单号的选择,请在供应商物料信息中维护',
+      labelMessage: '该记录中品番、供应商代码会影响单号的选择,请在供应商物料信息中维护',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择发料记录单号', // 输入框占位文本
@@ -429,7 +429,7 @@ export const OnlinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -437,7 +437,7 @@ export const OnlinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -445,7 +445,7 @@ export const OnlinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -529,7 +529,7 @@ export const OnlinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -604,6 +604,6 @@ export const OnlinesettlementRequestDetailRules = reactive({
     { required: true, message: '请选择库位代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
 })
\ No newline at end of file
diff --git a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
index 37201252e..12d94c04b 100644
--- a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
@@ -630,7 +630,7 @@ export const PickJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -638,7 +638,7 @@ export const PickJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -646,7 +646,7 @@ export const PickJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -654,7 +654,7 @@ export const PickJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemdesc2',
     sort: 'custom',
     table: {
@@ -774,7 +774,7 @@ export const PickJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
index 118700c5c..38ff51f3a 100644
--- a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
@@ -449,7 +449,7 @@ export const PickRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -493,7 +493,7 @@ export const PickRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -501,7 +501,7 @@ export const PickRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -509,7 +509,7 @@ export const PickRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -630,7 +630,7 @@ export const PickRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
index 6d58aa495..d812dc4aa 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
@@ -422,7 +422,7 @@ export const PickRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -470,7 +470,7 @@ export const PickRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -478,7 +478,7 @@ export const PickRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -486,7 +486,7 @@ export const PickRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -593,6 +593,6 @@ export const PickRequestDetailRules = reactive({
     { required: true, message: '请输入到库位代码', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
 })
\ No newline at end of file
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index 8d256fec5..1843aec71 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -90,7 +90,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
-import { getBaseUrl } from '@/utils/systemParam'
+import {getBaseUrl, getJmreportBaseUrl} from '@/utils/systemParam'
+import {getAccessToken} from "@/utils/auth";
 
 const { loadStart, loadDone } = usePageLoading()
 // 备料计划
@@ -176,7 +177,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         PreparetoissueMainApi.getBomDisassemble(val[0]['id'])
         .then(res => {
           if (res) tableData.value = res
-          // 根据子表物料代码 和主表生产线 查询生产线物料关系 获取 原料库位赋值目标库位
+          // 根据子表品番 和主表生产线 查询生产线物料关系 获取 原料库位赋值目标库位
           tableData.value.map(item => {
             ProductionlineitemApi.getProductionlineitemPage({
               productionLineCode: val[0]['productionLine'],
@@ -207,6 +208,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           console.log(err)
           message.error('错误')
         })
+      }
+       if (formField == 'workshop') {
+        //车间代码
+        tableData.value =[]
+      }
+       if (formField == 'prodLine') {
+        //车间代码
+        tableData.value =[]
       }
       formRef.setValues(setV)
     }
@@ -290,7 +299,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:preparetoissue-main:open'}), // 打开
+    // defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:preparetoissue-main:open'}), // 打开
     defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:preparetoissue-main:close'}), // 关闭
     defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:preparetoissue-main:submit'}), // 提交审批
     defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:preparetoissue-main:reject'}), // 驳回
@@ -309,6 +318,16 @@ const butttondata = (row,$index) => {
       link: true, // 文本展现按钮
       color: ''
     },
+    {
+      label: '打印补给品备料单',
+      name: 'printSupplyList',
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:preparetoissue-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
+
   ]
 }
 
@@ -371,17 +390,19 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainPlanPub') { // 发布
-    await message.confirm('确认要发布吗？')
-    tableObject.loading = true
-    PreparetoissueMainApi.publish(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      buttonBaseClick('refresh',null)
-      PreparetoissueMainApi.generateIssueRequest(row.number)
-    }).catch(err => {
-      tableObject.loading = false
-      console.log(err)
-    })
+    await message.confirm('确认要发布吗？');
+    tableObject.loading = true;
+
+    try {
+      await PreparetoissueMainApi.publish(row.masterId);
+      message.success(t('common.updateSuccess'));
+      await PreparetoissueMainApi.generateIssueRequest(row.number);
+    } catch (err) {
+      console.log(err);
+    } finally {
+      tableObject.loading = false;
+      buttonBaseClick('refresh', null);
+    }
   } else if (val == 'mainPlanRes') { // 重置
     await message.confirm('确认要重置吗？')
     tableObject.loading = true
@@ -420,9 +441,22 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)
+  } else if (val == 'printSupplyList'){
+    if(row.printFlag == 'FALSE'){
+      message.warning("发料任务未完成，不可打印")
+      return
+    }
+    // 打印补给品备料单
+    handlePrintSupplyList(row.masterId)
   }
 }
 
+const BASE_URL = getJmreportBaseUrl()
+const documentSrc = ref(BASE_URL + '/jmreport/view/1024904872747347968?token=' + getAccessToken())
+const handlePrintSupplyList = async (id) => {
+  window.open(documentSrc.value + '&id=' + id)
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index e92acfb6d..cbcbfa05d 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -110,7 +110,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
-      labelMessage: '该生产线会影响明细中的物料代码,工位',
+      labelMessage: '该生产线会影响明细中的品番,工位',
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
@@ -119,6 +119,10 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '生产线信息', // 查询弹窗标题
         searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'type',
+          value: 'predict',
+        }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -253,10 +257,11 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生产计划单号',
     field: 'productionPlanNumber',
     sort: 'custom',
+    isTable: true,
+    isSearch: true,
     table: {
-      width: 180
+      width: 200
     },
-    isTable: false,
     form: {
       labelMessage: '同时影响车间 生产线 班组 班次',
       componentProps: {
@@ -483,7 +488,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 220,
+      width: 320,
       fixed: 'right'
     },
   }
@@ -603,7 +608,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -614,7 +619,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料清单信息', // 查询弹窗标题
         multiple: true,
@@ -639,7 +644,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm: {
       enterSearch: true,
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '物料清单信息', // 查询弹窗标题
       searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
@@ -661,6 +666,25 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }], // 失去焦点校验参数
     },
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
   {
     label: '备料数量',
     field: 'issueQty',
@@ -908,7 +932,7 @@ export const PreparetoissueDetailRules = reactive({
     {required: true, message: '请输入单据号', trigger: 'blur'}
   ],
   itemCode: [
-    {required: true, message: '请选择物料代码', trigger: 'change'}
+    {required: true, message: '请选择品番', trigger: 'change'}
   ],
   workStation: [
     {required: true, message: '请选择工位', trigger: 'change'}
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index d505694c4..3527d32cd 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
index 4eaf12322..a5350a3dc 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -725,7 +725,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -736,7 +736,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:3,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -745,7 +745,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:3,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -754,7 +754,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -885,7 +885,7 @@ export const ProductionreceiptJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
index 6abc52371..98c48efbe 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index 045228cb0..8585ddd32 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -639,7 +639,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     hiddenInMain:true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -651,7 +651,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -699,7 +699,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     hiddenInMain:true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -709,7 +709,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
   },
 
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -852,7 +852,7 @@ export const ProductionreceiptRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index 3296a5f13..506ec34c1 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
index 3cc29ed56..c8c348b6f 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
@@ -631,7 +631,7 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -639,7 +639,7 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -647,16 +647,36 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain: true
+    isSearch:true,
+    isTableForm: false,
+    isForm: false,
+    // isSearch: true,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain: true
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -845,7 +865,7 @@ export const ProductionreturnJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
index 87c75fc7c..3ce510117 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
index 9d49cc04a..3288eba09 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
@@ -431,7 +431,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -439,13 +439,33 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch:true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    // isSearch: true,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '数量',
     field: 'qty',
@@ -458,7 +478,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     hiddenInMain: true,
@@ -467,7 +487,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     hiddenInMain: true,
@@ -749,7 +769,7 @@ export const ProductionreturnRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/index.vue
index 773bc2f08..1f84ee174 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts
index 2770c876e..4ab329c80 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts
@@ -446,7 +446,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -463,7 +463,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     sortTableDefault:5,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -471,7 +471,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     hiddenInMain: true,
@@ -480,7 +480,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     hiddenInMain: true,
@@ -782,7 +782,7 @@ export const ProductionreturnRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index af0e31d1c..b35b80b85 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -534,6 +534,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'cjbq') { // 创建标签
     // 判断 是否已创建标签
     let isCreateLabel = false
+    tableObject.loading = true
     await PackageApi.getPackagePage({
       requestNumber: row.number
     }).then(res => {
@@ -543,6 +544,7 @@ const buttonTableClick = async (val, row) => {
     })
     if (isCreateLabel) {
       message.warning('已创建过标签！！！')
+      tableObject.loading = false
       return
     }
     detatableData.params = {
@@ -609,10 +611,11 @@ const buttonTableClick = async (val, row) => {
               })
           }
         } else {
-          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          message.warning('没有查询到品番：【' + item.itemCode + '】')
           return
         }
         
+        tableObject.loading = false
         formLabelRef.value.open('create', row)
       })
     })
@@ -701,20 +704,30 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     message.warning("请先选择要打印的数据!")
     return
   }
+   tableObject.loading = true
+  try {
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
   let array = []//存储可采购数据
+  let arrayTool = []//存储可采购协定品数据
   let array1 = []//存储可制造数据
   let packingNumbers = []
   val.forEach((item,index) => {
     packingNumbers.push(item.number)
    
     if (item.itemType == '可采购') {
-      array.push(item)
+      if (item.itemBasicType =='TOOL') {
+        arrayTool.push(item)
+      } else {
+        array.push(item)
+      }
     }
     if (item.itemType == '可制造') {
       array1.push(item)
     }
   })
+  console.log(arrayTool)
+  console.log(array)
+  // 打印采购件
   if (array.length>0) {
     await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
       console.log(res)
@@ -724,6 +737,16 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
       message.error('创建标签失败')
     })
   }
+  // 打印协定品采购件
+  if (arrayTool.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:arrayTool.map(item1=>item1.number)}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+  }
   if (array1.length > 0) {
     await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
       console.log(res)
@@ -746,7 +769,10 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   // }).catch(err => {
   //   console.log(err)
   //   message.error('创建标签失败')
-  // })
+    // })
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 // 获取部门 用于详情 部门回显
@@ -901,31 +927,36 @@ const BASE_URL = getJmreportBaseUrl()
 // 标签打印
 const handlePoint = async (row) => {
   // 查询是否已创建过标签
-  await PackageApi.getPackagePage({
-    requestNumber: row.number
-  }).then((res) => {
-    if(res.list.length > 0) {
-      isCreateLabel.value = true
-      if (res.list[0].supplierCode != null) {
-        labelType.value = 'cg'
-      } else if(res.list[0].productionLineCode != null){
-        labelType.value = 'zz'
+  tableObject.loading = true
+  try {
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then((res) => {
+      if(res.list.length > 0) {
+        isCreateLabel.value = true
+        if (res.list[0].supplierCode != null) {
+          labelType.value = 'cg'
+        } else if(res.list[0].productionLineCode != null){
+          labelType.value = 'zz'
+        } else {
+          isCreateLabel.value = false
+          message.warning('不是采购类型也不是制造类型物料不能打印标签！')
+        }
       } else {
         isCreateLabel.value = false
-        message.warning('不是采购类型也不是制造类型物料不能打印标签！')
       }
-    } else {
+    }).catch(err => {
       isCreateLabel.value = false
+      console.log(err)
+    })
+    // 判断是采购还是制造
+    if (isCreateLabel.value) {
+      labelPrint(row)
+    } else {
+      message.warning('请先创建标签')
     }
-  }).catch(err => {
-    isCreateLabel.value = false
-    console.log(err)
-  })
-  // 判断是采购还是制造
-  if (isCreateLabel.value) {
-    labelPrint(row)
-  } else {
-    message.warning('请先创建标签')
+  } finally {
+    tableObject.loading = false
   }
 }
 
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index b754df42d..68bd98e1b 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -892,7 +892,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
   //   }
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -902,7 +902,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -931,7 +931,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       multiple: true,
       disabled:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -1003,7 +1003,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
   //   }
   // },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1013,18 +1013,37 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },
-    hiddenInMain: true,
-    isTableForm: false,
     isForm: false,
+    // isSearch: true,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain: true,
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1227,7 +1246,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     //   },{
     //     key: 'itemCode',
     //     value: 'itemCode',
-    //     message: '请先选择物料代码！',
+    //     message: '请先选择品番！',
     //     isMainValue: true
     //     }],
     // verificationParams: [{
@@ -1255,7 +1274,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
         },{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+          message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
           isMainValue: true
         }]
       }
@@ -1388,7 +1407,7 @@ export const ProductionreturnRequestDetailRules = reactive({
   //   { required: true, message: '请输入从库位代码', trigger: 'blur' }
   // ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   packUnit: [
     { required: true, message: '请输入包装规格', trigger: 'blur' }
@@ -1410,7 +1429,7 @@ export const ProductionreturnRequestDetailRules = reactive({
 export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
  
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1566,7 +1585,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1576,7 +1595,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1586,7 +1605,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1659,7 +1678,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       searchCondition: [{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       }]
     }
@@ -1693,7 +1712,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     },
   },
 {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -1701,6 +1720,15 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       width: 150,
     },
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
 {
     label: '批次',
     field: 'batch',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index bb512fad1..40a7314c1 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -545,7 +545,7 @@ const buttonTableClick = async (val, row) => {
           })
           }
         } else {
-          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          message.warning('没有查询到品番：【' + item.itemCode + '】')
           return
         }
       })
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMain.data.ts
index fad687729..3d2077294 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMain.data.ts
@@ -735,7 +735,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -745,7 +745,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -766,7 +766,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -822,7 +822,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
   //   }
   // },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -832,7 +832,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -843,7 +843,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1050,7 +1050,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     //   },{
     //     key: 'itemCode',
     //     value: 'itemCode',
-    //     message: '请先选择物料代码！',
+    //     message: '请先选择品番！',
     //     isMainValue: true
     //     }],
     // verificationParams: [{
@@ -1078,7 +1078,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
         },{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+          message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
           isMainValue: true
         }]
       }
@@ -1205,7 +1205,7 @@ export const ProductionreturnRequestDetailRules = reactive({
   //   { required: true, message: '请输入从库位代码', trigger: 'blur' }
   // ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   packUnit: [
     { required: true, message: '请输入包装规格', trigger: 'blur' }
@@ -1265,13 +1265,13 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       searchCondition:[{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       }]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1406,7 +1406,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1416,7 +1416,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1426,7 +1426,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1484,7 +1484,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     },
   },
 {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 0af4a1361..6164f68ce 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -239,7 +239,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
       }
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -249,7 +249,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'itemCode', // 查询弹窗赋值字段
           searchTitle: '库存余额信息', // 查询弹窗标题
           searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -271,7 +271,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
       },
       tableForm: {
         isInpuFocusShow: true,
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -329,7 +329,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
     //   }
     // },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -339,7 +339,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
       isForm: false
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -350,7 +350,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
       isForm: false
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -568,7 +568,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
         //   {
         //     key: 'itemCode',
         //     value: 'itemCode',
-        //     message: '请先选择物料代码！',
+        //     message: '请先选择品番！',
         //     isMainValue: true
         //   }
         // ]
@@ -591,7 +591,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
             {
               key: 'itemCode',
               value: 'itemCode',
-              message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+              message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
               isMainValue: true
             }
           ]
@@ -718,7 +718,7 @@ export const ProductionreturnRequestDetailRules = reactive({
   //   { required: true, message: '请输入从库位代码', trigger: 'blur' }
   // ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   packUnit: [
     { required: true, message: '请输入包装规格', trigger: 'blur' }
@@ -748,7 +748,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
       multiple:true,
       disabled:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -756,7 +756,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
       searchCondition: [{
         key:'itemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -783,7 +783,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
       searchCondition:[{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isTableRowValue: true, //查询当前searchTable表中行数据的值
         isMainValue: false
 
@@ -791,7 +791,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -928,7 +928,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -938,7 +938,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -948,7 +948,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1009,7 +1009,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     },
   },
 {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index b8cb9edf4..4bfab0dd2 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -624,7 +624,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -632,7 +632,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -640,7 +640,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     hiddenInMain: true,
@@ -649,7 +649,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     hiddenInMain: true,
@@ -942,7 +942,7 @@ export const ProductionscrapRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 00bf58233..5c98a6410 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -562,7 +562,7 @@ const buttonTableClick = async (val, row) => {
           })
           }
         } else {
-          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          message.warning('没有查询到品番：【' + item.itemCode + '】')
           return
         }
       })
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 31c6a4260..e1d41b3bf 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -1288,7 +1288,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1298,7 +1298,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -1319,7 +1319,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -1343,7 +1343,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1353,7 +1353,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1364,7 +1364,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1630,7 +1630,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       },{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请先选择物料代码！',
+        message: '请先选择品番！',
         isMainValue: true
         }],
     verificationParams: [{
@@ -1658,7 +1658,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         },{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+          message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
           isMainValue: true
         }]
       }
@@ -1803,7 +1803,7 @@ export const ProductionscrapRequestDetailRules = reactive({
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -1846,14 +1846,14 @@ export const ProductionscrapRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       searchCondition:[{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isTableRowValue: true, //查询当前searchTable表中行数据的值
         isMainValue: false
       }]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -2004,7 +2004,7 @@ export const ProductionscrapRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -2014,7 +2014,7 @@ export const ProductionscrapRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -2024,7 +2024,7 @@ export const ProductionscrapRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -2082,7 +2082,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     },
   },
 {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index d8cc0315f..ca3a73504 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -794,7 +794,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -805,7 +805,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:3,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -814,7 +814,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:3,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -823,7 +823,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemdesc2',
     sort: 'custom',
     table: {
@@ -953,7 +953,7 @@ export const RepleinshJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
index 250073f0d..05d5cbac7 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -632,7 +632,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -643,7 +643,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:4,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -691,7 +691,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -700,7 +700,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 2d8b4948c..d91138b3d 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -538,7 +538,7 @@ export const RepleinshRequestMainRules = reactive({
  */
 export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -551,7 +551,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -567,7 +567,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       multiple:true,
       disabled:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '物料基础信息', // 查询弹窗标题
       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -593,7 +593,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     sortTableDefault:4,
@@ -601,7 +601,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -612,7 +612,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -935,7 +935,7 @@ export const RepleinshRequestDetailRules = reactive({
   //   { required: true, message: '请输入到库位代码', trigger: 'blur' }
   // ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
index 3f44d4305..3d16165cc 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
index 4e4544489..27cf0616c 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
@@ -323,7 +323,7 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -331,7 +331,7 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -339,7 +339,7 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -347,7 +347,7 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -764,7 +764,7 @@ export const InventorychangeRecordDetailRules = reactive({
   //   { required: true, message: '请输入单据号', trigger: 'blur' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 267b3907d..c60e50491 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -107,6 +107,7 @@ import * as InventorychangeRequestDetailApi from '@/api/wms/inventorychangeReque
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { formatTime } from '@/utils/index'
 const { loadStart, loadDone } = usePageLoading()
 
 
@@ -163,6 +164,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['locationCode'] = item['locationCode']
           newRow['uom'] = item['uom']
           newRow['originFrozen'] = newRow['frozen']=='TRUE'?true:false //记录原始数据用于判断
+          newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
       } else {
@@ -482,7 +484,7 @@ const submitForm = async (formType, submitData) => {
   // }
   if (duplicateItems.length>0) {
     formRef.value.formLoading = false
-    return message.warning('物料代码重复')
+    return message.warning('品番重复')
   }
   data.subList.forEach(obj => {
     if(obj.toQty == 0){
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 183985577..227ea7c7f 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -332,7 +332,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -411,7 +411,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -421,7 +421,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     tableForm: {
       multiple: true,
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '库存余额信息',
       searchAllSchemas: BalancePopWindow.allSchemas,
@@ -438,7 +438,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: BalancePopWindow.allSchemas,
@@ -454,7 +454,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -464,7 +464,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -474,7 +474,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -507,11 +507,16 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm: {
-      disabled: true
+      disabled: false,
+      type:'FormDate',
+      placeholder: '请选择到批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
     },
     form: {
       componentProps: {
-        disabled: true
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
       }
     }
   },
@@ -1030,7 +1035,7 @@ export const InventorychangeRequestDetailRules = reactive({
     { required: true, message: '请选择到库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+    { required: true, message: '请点击从包装号选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
index d75ff12ce..69f8ac731 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index fcef8685e..f1d4ccf4f 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -654,7 +654,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -663,7 +663,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:7,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -672,7 +672,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:8,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -681,7 +681,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:9,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -917,7 +917,7 @@ export const InventorymoveJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
index 137a5524a..466e56ba4 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
index 83f1870e4..441d1c06f 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
@@ -422,7 +422,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -430,7 +430,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -438,7 +438,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -446,7 +446,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -740,7 +740,7 @@ export const InventorymoveRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index b849ca2e1..cf3a5cf56 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts
index 054543803..b7a1ca676 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts
@@ -436,7 +436,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     hiddenInMain: true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -445,7 +445,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     sortTableDefault:10,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -454,7 +454,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     sortTableDefault:27
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -463,7 +463,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     sortTableDefault:28
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -764,7 +764,7 @@ export const InventorymoveRecordDetailNewRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
index df007bf1b..2d8e4d1db 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
@@ -245,7 +245,7 @@ export const InventorymoveRequestMainRules = reactive({
  */
 export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -351,7 +351,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       multiple: false,
       disabled: true,
       isInpuFocusShow: false, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'packUnit',
       searchTitle: '物料包装信息',
       searchAllSchemas: Itempackaging.allSchemas,
@@ -359,7 +359,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchCondition: [{
         key:'itemCode', // 查询列表中字段
         value:'itemCode', // 指主表某字段 
-        message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
+        message: '请选择品番！', // 当前置条件为空时 弹出信息提示
         isMainValue: true, // 表示查询条件是主表的字段的值
         action: '==', // 查询拼接条件
       }]
@@ -369,7 +369,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         disabled: true,
         isSearchList: false, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'packUnit',
         searchTitle: '物料包装信息',
         searchAllSchemas: Itempackaging.allSchemas,
@@ -377,7 +377,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchCondition: [{
           key:'itemCode', // 查询列表中字段
           value:'itemCode', // 指主表某字段 
-          message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
+          message: '请选择品番！', // 当前置条件为空时 弹出信息提示
           isMainValue: true, // 表示查询条件是主表的字段的值
           action: '==', // 查询拼接条件
         }]
@@ -508,7 +508,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
 //表单校验
 export const InventorymoveRequestDetailRules = reactive({
   itemCode: [
-    { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+    { required: true, message: '请点击从包装号选择品番', trigger: 'change' }
   ],
   fromInventoryStatus: [
     { required: true, message: '请选择从库存状态', trigger: 'change' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue
index 317389888..4fdeef3b6 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
index 38a592344..fbe2cff25 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
@@ -441,7 +441,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:4,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -450,7 +450,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:10,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -459,7 +459,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:11,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -468,7 +468,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:12,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -808,7 +808,7 @@ export const InventorymoveRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index cc6f1027c..10957c590 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -92,6 +92,7 @@ import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import {importTemplateHoldOk} from "@/api/wms/inventorymoveRequestMain";
 import * as ruleApi  from '@/api/wms/rule/index'
+import { formatTime } from '@/utils/index'
 const { loadStart, loadDone } = usePageLoading()
 // 库存转移申请
 defineOptions({ name: 'InventorymoveRequestMain' })
@@ -412,6 +413,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           }else{
             newRow['toInventoryStatus'] = item['inventoryStatus']
           }
+          newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
       } else {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index ec54143ec..ee42652fd 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -459,7 +459,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -513,7 +513,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -522,7 +522,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     tableForm: {
       multiple: true,
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '库存余额信息',
       searchAllSchemas: BalancePopWindow.allSchemas,
@@ -542,7 +542,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: BalancePopWindow.allSchemas,
@@ -561,7 +561,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -571,7 +571,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -581,7 +581,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -619,6 +619,19 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTableForm: true,
     isForm: true,
+    tableForm: {
+      disabled: false,
+      type:'FormDate',
+      placeholder: '请选择到批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
+    form: {
+      componentProps: {
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
   },
   {
     label: '从包装号',
@@ -980,10 +993,10 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
 //表单校验
 export const InventorymoveRequestDetailRules = reactive({
   // itemCode: [
-  //   { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+  //   { required: true, message: '请点击从包装号选择品番', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   fromLocationCode: [
     { required: true, message: '请选择从库位代码', trigger: 'change' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue
index 4b4450b94..f1b5bf9aa 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts
index 89051f01f..5a1650576 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts
@@ -504,7 +504,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -514,7 +514,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       tableForm: {
       multiple: true,
       isInpuFocusShow: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '库存余额信息',
       searchAllSchemas: BalancePopWindow.allSchemas,
@@ -524,7 +524,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: BalancePopWindow.allSchemas,
@@ -533,7 +533,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -543,7 +543,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -553,7 +553,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -932,7 +932,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
 //表单校验
 export const InventorymoveRequestDetailRules = reactive({
   itemCode: [
-    { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+    { required: true, message: '请点击从包装号选择品番', trigger: 'change' }
   ],
   fromLocationCode: [
     { required: true, message: '请选择从库位代码', trigger: 'change' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
index 8e13ddb3c..c668ff462 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -95,6 +95,7 @@ import * as LocationApi  from '@/api/wms/location'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import * as ruleApi  from '@/api/wms/rule/index'
+import { formatTime } from '@/utils/index'
 const { loadStart, loadDone } = usePageLoading()
 // 库存转移申请
 // 只有库存转移申请在使用的
@@ -327,6 +328,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['uom'] = item['uom']
           newRow['qty'] = item['qty']
           newRow['toInventoryStatus'] = item['inventoryStatus']//库存移动申请
+          newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
       }else if (formField == 'toLocationCode') {
@@ -347,7 +349,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         if (toManagementPrecision.value == 'BY_BATCH') {
           if(row['fromBatch']==''){
             row['fromBatchFormItemType'] = 'FormDate'
-            row['disabled_fromBatch'] = false
+            row['disabled_fromBatch'] = true
           }
          
         } else if (toManagementPrecision.value == 'BY_QUANTITY') {
@@ -725,10 +727,10 @@ const submitForm = async (formType, submitData) => {
     message.warning('从库位和到库位不能相同')
     return
   }
-  let batchList = tableData.value.filter(item=>item.fromBatchFormItemType&&item.fromBatchFormItemType == 'FormDate' && item.toManagementPrecision == 'BY_BATCH')
-  let noBatch = batchList.find(item => !item.fromBatch)
-  if(noBatch){
-    message.warning(`${noBatch.itemCode}没有填写批次，请填写`)
+  let batchList = tableData.value.filter(item=>item.toManagementPrecision == 'BY_BATCH')
+  let noToBatch = batchList.find(item => !item.toBatch)
+  if(noToBatch){
+    message.warning(`${noToBatch.itemCode}没有填写到批次，请填写`)
     return
   }
   data.subList = tableData.value // 拼接子表数据参数
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
index caf3af137..f16b0ad64 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
@@ -504,7 +504,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -513,7 +513,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     tableForm: {
       multiple: true,
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '库存余额信息',
       searchAllSchemas: BalancePopWindow.allSchemas,
@@ -523,7 +523,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: BalancePopWindow.allSchemas,
@@ -532,7 +532,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -542,7 +542,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -552,7 +552,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -588,22 +588,27 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
-  // {
-  //   label: '到批次',
-  //   field: 'toBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: true,
-  //   isForm: false,
-  //   tableForm: {
-  //     disabled: true,
-  //     placeholder: '请选择从批次',
-  //     valueFormat: 'YYYYMMDD',
-  //     format: 'YYYYMMDD',
-  //   },
-  // },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false,
+      type:'FormDate',
+      placeholder: '请选择到批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
+    form: {
+      componentProps: {
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
+  },
   {
     label: '从包装号',
     field: 'fromPackingNumber',
@@ -945,10 +950,10 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
 //表单校验
 export const InventorymoveRequestDetailRules = reactive({
   // itemCode: [
-  //   { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+  //   { required: true, message: '请点击从包装号选择品番', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   fromLocationCode: [
     { required: true, message: '请选择从库位代码', trigger: 'change' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index 85eb0367d..904a2f1c0 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -98,6 +98,7 @@ import { formatDate } from '@/utils/formatTime'
 import dayjs from 'dayjs'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import * as ruleApi  from '@/api/wms/rule/index'
+import { formatTime } from '@/utils/index'
 const { loadStart, loadDone } = usePageLoading()
 // 物料隔离申请OktoholdRequestMain
 // 只有物料隔离申请在使用的
@@ -379,6 +380,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             newRow.disabled_supplierCode = true
             newRow.isInpuFocusShow_supplierCode = false
           }
+          newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
       } else if(formField == 'supplierCode'){
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
index 5cfc9a2b0..0110037d2 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@@ -495,7 +495,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -534,7 +534,7 @@ export const InventorymoveRequestMainRules = reactive({
 export const BalanceShow = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -614,7 +614,7 @@ export const BalanceShow = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -623,7 +623,7 @@ export const BalanceShow = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -633,7 +633,7 @@ export const BalanceShow = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -1061,7 +1061,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1138,7 +1138,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1149,7 +1149,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:5,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1160,7 +1160,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:6,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1215,6 +1215,19 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm: true,
     isForm: true,
     sortTableDefault:9,
+    tableForm: {
+      disabled: false,
+      type:'FormDate',
+      placeholder: '请选择到批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
+    form: {
+      componentProps: {
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
   },
   // {
   //   label: '供应商代码',
@@ -1239,7 +1252,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
   //     },{
   //       key: 'itemCode',
   //       value: 'itemCode',
-  //       message: '物料代码不能为空!',
+  //       message: '品番不能为空!',
   //       isTableRowValue: true, //查询当前searchTable表中行数据的值
   //       isMainValue:false
   //     }]
@@ -1556,7 +1569,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
 //表单校验
 export const InventorymoveRequestDetailRules = reactive({
   itemCode: [
-    { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+    { required: true, message: '请点击从包装号选择品番', trigger: 'change' }
   ],
   fromLocationCode: [
     { required: true, message: '请选择从库位代码', trigger: 'change' }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/index.vue
new file mode 100644
index 000000000..ca74a1b09
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/index.vue
@@ -0,0 +1,874 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...InventorymoveRequestMain.allSchemas.searchSchema,...InventorymoveRequestDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventorymoveRequestMain.allSchemas"
+      :detailAllSchemas="InventorymoveRequestDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
+    @success="getList"
+    :rules="InventorymoveRequestMainRules"
+    :formAllSchemas="InventorymoveRequestMain.allSchemas"
+    :tableAllSchemas="InventorymoveRequestDetail.allSchemas"
+    :tableFormRules="InventorymoveRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="InventorymoveRequestMainApi.updateInventorymoveRequestMain"
+    :apiCreate="InventorymoveRequestMainApi.createInventorymoveRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventorymoveRequestMain.allSchemas"
+    :detailAllSchemas="InventorymoveRequestDetail.allSchemas"
+    :detailAllSchemasRules="InventorymoveRequestDetailRules"
+    :apiCreate="InventorymoveRequestDetailApi.createInventorymoveRequestDetail"
+    :apiUpdate="InventorymoveRequestDetailApi.updateInventorymoveRequestDetail"
+    :apiPage="InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage"
+    :apiDelete="InventorymoveRequestDetailApi.deleteInventorymoveRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/inventorymove-request-main/import" :importTemplateData="importTemplateData"
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRequestMain.data'
+import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
+import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {importTemplateHoldOk} from "@/api/wms/inventorymoveRequestMain";
+import * as ruleApi  from '@/api/wms/rule/index'
+import { formatTime } from '@/utils/index'
+const { loadStart, loadDone } = usePageLoading()
+// 库存转移申请
+defineOptions({ name: 'InventorymoveRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...InventorymoveRequestMain.allSchemas.tableColumns,...InventorymoveRequestDetail.allSchemas.tableMainColumns])
+const businessType = ref()
+
+console.log(99 ,  routeName.value)
+const fromInventoryStatus = ref()
+const toInventoryStatus = ref()
+const importFileName = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ * OktoholdRequestMain 合格转隔离
+ */
+if ( routeName.value == 'NoktoholdRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
+    businessType :'NokToHold'
+  }
+  fromInventoryStatus.value = 'NOK'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
+}
+else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
+    businessType :'HoldToOk'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "OK"
+  businessType.value = 'HoldToOk'
+  importFileName.value = '隔离转合格申请'
+} else if ( routeName.value == 'HoldtoscrapRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
+    businessType:'HoldToScrap'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "SCRAP"
+  businessType.value = 'HoldToScrap'
+  importFileName.value = '隔离转报废申请'
+} else if ( routeName.value == 'OktoscrapRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
+    businessType :'OkToScrap'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "SCRAP"
+  businessType.value = 'OkToScrap'
+  importFileName.value = '合格转报废申请'
+}
+else if ( routeName.value == 'ScraptoholdRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
+    businessType :'ScrapToHold'
+  }
+  fromInventoryStatus.value = 'SCRAP'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHold'
+  importFileName.value = '报废转隔离申请'
+} else {
+  tableObject.params = {
+    businessType :'Move'
+  }
+  businessType.value = 'Move'
+  importFileName.value = '库存移动申请'
+}
+console.log(99 ,  businessType.value)
+
+InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
+  if(item.field == 'fromWarehouseCode') {
+    if (fromInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }
+     ]
+    } else if (fromInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+    } else {
+      delete item.tableForm.searchCondition
+    }
+  }
+})
+// 修改 tableform 属性
+InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
+  if(item.field == 'itemCode') {
+    if (fromInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key:'fromWarehouseCode',
+        value:'fromWarehouseCode',
+        message: '请选择从仓库代码！',
+        isMainValue: true
+      },
+        {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }
+     ]
+    } else if (fromInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key:'fromWarehouseCode',
+        value:'fromWarehouseCode',
+        message: '请选择从仓库代码！',
+        isMainValue: true
+      },
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }]
+    } else {
+      delete item.tableForm.searchCondition
+    }
+  }
+  if(item.field == "toLocationCode"){
+    if (toInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }]
+    }else if (toInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }]
+    }
+  }
+})
+if(routeName.value == 'HoldtookRequestMain'){
+  //解决雪冰隔离转合格的bug导致其他页面没有到库位代码的问题
+  InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{
+    if(item.field=='toLocationCode'){
+      item.hidden = true
+    }
+  })
+}else{
+  InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{
+    if(item.field=='toLocationCode'){
+      item.hidden = false
+    }
+  })
+  
+}
+console.log('tableFormColumns',InventorymoveRequestDetail.allSchemas.tableFormColumns)
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+const fromManagementPrecision = ref('')
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async() => {
+    if (type == 'tableForm') {
+      if (formField == 'itemCode') {
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        if(val.length==0) return
+        val.forEach(async item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          // newRow['fromPackingNumber'] = item['packingNumber']
+          newRow['fromContainerNumber'] = item['containerNumber']
+          newRow['itemCode'] = item['itemCode']
+          newRow['balanceQty'] = item['qty']
+          if (item['batch'] != '') {
+            newRow['fromBatch'] = item['batch']
+          }
+          // else{
+          //   newRow['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期
+          // }
+          await ruleApi.getManagementPrecision({
+        	itemCodes: [item['itemCode']],
+		      locationCode:val[0]['locationCode']
+        }).then((res) => {
+          fromManagementPrecision.value = res[0].ManagementPrecision
+        })
+        if (fromManagementPrecision.value == 'BY_QUANTITY') {
+          newRow['fromBatchFormItemType'] = 'FormDate'
+          newRow['disabled_fromBatch'] = false
+        } else {
+          newRow['fromBatchFormItemType'] = ''
+          newRow['disabled_fromBatch'] = true
+        }
+          newRow['fromInventoryStatus'] = item['inventoryStatus']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['uom'] = item['uom']
+          newRow['qty'] = item['qty']
+          newRow['inventoryQty'] = item['qty']
+          if(routeName.value == 'NoktoholdRequestMain'){
+            newRow['toInventoryStatus'] = "HOLD"
+          }else if ( routeName.value == 'HoldtookRequestMain') {
+            newRow['toInventoryStatus'] = "OK"
+          }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+            newRow['toInventoryStatus'] = "SCRAP"
+          }else if ( routeName.value == 'OktoscrapRequestMain') {
+            newRow['toInventoryStatus'] = "SCRAP"
+          }else if ( routeName.value == 'ScraptoholdRequestMain') {
+            newRow['toInventoryStatus'] = "HOLD"
+          }else{
+            newRow['toInventoryStatus'] = item['inventoryStatus']
+          }
+          newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd')
+          tableData.value.push(newRow)
+        })
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if (formField == 'fromWarehouseCode') {
+        if(InventorymoveRequestDetail?.allSchemas?.tableFormColumns?.find(item => (item.field == 'itemCode'))?.tableForm?.searchCondition?.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail?.allSchemas?.tableFormColumns?.find(item => (item.field == 'itemCode'))?.tableForm?.searchCondition?.push({
+          key: 'warehouseCode',
+          value: val[0]["code"],
+          isMainValue: false
+        })
+      } else {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => {
+          if (item.key == 'warehouseCode') {
+            item.value = val[0]["code"]
+          }
+        })
+        }
+      
+        tableData.value = []
+      }
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'itemCode') {
+      setV['fromContainerNumber'] = val[0]['containerNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['fromBatch'] = val[0]['batch']
+      setV['fromInventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['locationCode']
+      setV['uom'] = val[0]['uom']
+      if(routeName.value == 'NoktoholdRequestMain'){
+        setV['toInventoryStatus'] = "HOLD"
+      }else if ( routeName.value == 'HoldtookRequestMain') {
+        setV['toInventoryStatus'] = "OK"
+      }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+        setV['toInventoryStatus'] = "SCRAP"
+        }else if ( routeName.value == 'OktoscrapRequestMain') {
+        setV['toInventoryStatus'] = "SCRAP"
+      }else if ( routeName.value == 'ScraptoholdRequestMain') {
+        setV['toInventoryStatus'] = "HOLD"
+      }else{
+        setV['toInventoryStatus'] = val[0]['inventoryStatus']
+      }
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:handle`}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.close(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.reAdd(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.submit(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.refused(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.agree(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.handle(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.masterId)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  // InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{
+    // if(item.field == 'qty'){
+    //   item.tableForm.disabled = routeName.value == "HoldtookRequestMain"
+    // }
+  // })
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/**
+ * 详情 新增/编辑事件
+ */
+const detailOpenForm = (type, row) => {
+  InventorymoveRequestDetail.allSchemas.formSchema.forEach(item=>{
+    if(item.field == 'qty'){
+      item.componentProps.disabled = routeName.value == "HoldtookRequestMain"
+    }
+  })
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.push({
+          key: 'warehouseCode',
+          value: fromWarehouseCodeMain.value,
+          isMainValue: false
+        })
+      } else {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => {
+          if (item.key == 'warehouseCode') {
+            item.value = fromWarehouseCodeMain.value
+          }
+        })
+      }
+}
+
+const fromWarehouseCodeMain = ref()
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  fromWarehouseCodeMain.value = row.fromWarehouseCode
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"requestInventorymoveMain")
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await InventorymoveRequestMainApi.deleteInventorymoveRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    if ( routeName.value == 'HoldtookRequestMain') {
+      const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+      const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }else if ( routeName.value == 'OktoscrapRequestMain') {
+      const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
+        // else if ( routeName.value == 'ScraptoholdRequestMain') {
+        //   const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params)
+        //   download.excel(data, '报废转隔离申请主.xlsx')
+        // }
+    else{
+      const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  let findLocation = tableData.value.find(item=>item.fromLocationCode==item.toLocationCode&&item.fromInventoryStatus==item.toInventoryStatus)
+  if(findLocation){
+    message.warning('从库位和到库位不能相同')
+    return
+  }
+  data.businessType = businessType.value
+  data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(item => {
+    item.toLocationCode = data.toLocationCode
+  })
+  // let isExist = false
+  // tableData.value.forEach(item => {
+  //   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
+  //   console.log(rs,5666);
+  //  if(rs.length > 1) isExist = true
+  // })
+  // if (isExist) {
+  //   formRef.value.formLoading = false
+  //   isExist = false
+  //   return message.warning('物料号重复')
+  // }
+  flag.value = false
+  data.subList.forEach(item => {
+    console.log(556565,item);
+    if(fromInventoryStatus.value){
+      //item.fromInventoryStatus = fromInventoryStatus.value
+      item.toInventoryStatus = toInventoryStatus.value
+    }
+    if(item.qty == 0){
+      message.error(`到数量不能为0!`)
+      flag.value = true
+      return;
+    }
+          })
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
+  formRef.value.formLoading = true
+  try {
+    const cmdExists = data.subList.some(filter =>
+      parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
+    );
+    if(cmdExists){
+      message.warning("数量不能大于库存数量")
+      return
+    }
+    if (formType === 'create') {
+      await InventorymoveRequestMainApi.createInventorymoveRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InventorymoveRequestMainApi.updateInventorymoveRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+const searchList = (model)=>{
+  model.businessType=businessType.value
+  setSearchParams(model)
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+
+  //隔离转合格
+
+    importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateHoldOkNew()
+ 
+})
+const getFormattedDate = () =>{
+      const a = new Date();
+      const year = a.getFullYear();
+      const month = String(a.getMonth() + 1).padStart(2, '0');
+      const day = String(a.getDate()).padStart(2, '0');
+      return `${year}${month}${day}`;
+    }
+</script>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts
new file mode 100644
index 000000000..43a448a29
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts
@@ -0,0 +1,1057 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { BalancePopWindow } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as LocationApi  from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'MoveRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ 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} 库存转移申请主表
+ */
+export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库基础信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择从仓库代码',
+        searchField: 'code',
+        searchTitle: '仓库基础信息',
+        searchAllSchemas: Warehouse.allSchemas,
+        searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+      label: '到库位代码', // 子表数据--新增在form上展示
+      field: 'toLocationCode',
+      sort: 'custom',
+      isForm:true,
+      isTable:false,
+      isDetail:false,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择到库位代码',
+          searchField: 'code',
+          searchTitle: '库位信息',
+          searchAllSchemas: Location.allSchemas,
+          searchPage: LocationApi.selectBusinessTypeToLocation,
+          searchCondition: [
+            {
+              key: 'businessType',
+              value: 'HoldToOk',
+              isMainValue: false
+            },{
+              key: 'isIn',
+              value: 'in',
+              isMainValue: false
+          }],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
+        }
+      }
+    },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isTableForm:false,
+    isForm: false,
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    isDetail: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    sortTableDefault: 1001,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    sortTableDefault: 1001,
+  },
+  // {
+  //   label: '从库区类型范围',
+  //   field: 'fromAreaTypes',
+  //   // dictType: DICT_TYPE.AREA_TYPE,
+  //   // dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '从库区代码范围',
+  //   field: 'fromAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  // },
+
+  // {
+  //   label: '到库区类型范围',
+  //   field: 'toAreaTypes',
+  //   // dictType: DICT_TYPE.AREA_TYPE,
+  //   // dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '到库区代码范围',
+  //   field: 'toAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '业务类型',
+  //   field: 'businessType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     value: 'Move',
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   },
+  //   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',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+    sortTableDefault:1000
+  },
+  // {
+  //   label: '自动提交',
+  //   field: 'autoCommit',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   isForm: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoCommit,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '自动通过',
+  //   field: 'autoAgree',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   isForm: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoAgree,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '自动执行',
+  //   field: 'autoExecute',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   isForm: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoExecute,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isForm: false,
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '使用在途库',
+  //   field: 'useOnTheWayLocation',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: true,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    sortTableDefault: 1001,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: true,
+    sortTableDefault: 1001,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false,
+    sortTableDefault: 1001,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    sortTableDefault: 1001,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 250,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InventorymoveRequestMainRules = reactive({
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存转移申请子表
+ */
+export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    hiddenInMain: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      multiple: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择品番',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: BalancePopWindow.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
+      searchCondition: [{
+        key:'fromWarehouseCode',
+        value:'fromWarehouseCode',
+        message: '请选择从仓库代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }],
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择品番',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: BalancePopWindow.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
+        searchCondition: [{
+          key:'fromWarehouseCode',
+          value:'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+      }
+    }
+  },
+  {
+    label: '品名',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '描述',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      placeholder: '请选择从批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: true,
+    isForm: true,
+    tableForm: {
+      disabled: false,
+      type:'FormDate',
+      placeholder: '请选择到批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
+    form: {
+      componentProps: {
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      placeholder: '请选择从包装号',
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        placeholder: '请选择从包装号',
+      }
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
+  {
+    label: '库存余额',
+    field: 'balanceQty',
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+      searchCondition: [
+      {
+        key: 'type',
+        value: 'businessType',
+        isMainValue: true
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+        }],
+      isRepeat:true,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+        searchCondition: [
+          {
+            key: 'type',
+            value: 'businessType',
+            isMainValue: true
+          },{
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   hiddenInMain: true,
+  // },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   hiddenInMain: true,
+  // },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   hiddenInMain: true,
+  // },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false
+  },
+  // {
+  //   label: '最后更新时间',
+  //   field: 'updateTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  // {
+  //   label: '最后更新者',
+  //   field: 'updater',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    hiddenInMain: true,
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const InventorymoveRequestDetailRules = reactive({
+  // itemCode: [
+  //   { required: true, message: '请点击从包装号选择品番', trigger: 'change' }
+  // ],
+  itemCode: [
+    { required: true, message: '请选择品番', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  // fromPackingNumber: [
+  //   { required: true, message: '请选择从包装号', trigger: 'change' }
+  // ],
+  fromInventoryStatus: [
+    { required: true, message: '请选择从库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/moveManage/itemChange/index.vue b/src/views/wms/moveManage/itemChange/index.vue
index 33be9148c..97bc7449e 100644
--- a/src/views/wms/moveManage/itemChange/index.vue
+++ b/src/views/wms/moveManage/itemChange/index.vue
@@ -15,7 +15,7 @@
     }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort">
       <template #itemCode="{ row }">
-        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+        <el-button type="primary" link @click="openDetail(row, '品番', row.itemCode)">
           <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
diff --git a/src/views/wms/moveManage/itemChange/itemChange.data.ts b/src/views/wms/moveManage/itemChange/itemChange.data.ts
index 6415e0ac9..a13563d5c 100644
--- a/src/views/wms/moveManage/itemChange/itemChange.data.ts
+++ b/src/views/wms/moveManage/itemChange/itemChange.data.ts
@@ -16,7 +16,7 @@ export const ItemChange = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -485,7 +485,7 @@ export const ItemChangeRules = reactive({
   //   { required: true, message: '请选择器具号', trigger: 'change' }
   // ],
   // itemCode: [
-  //   { required: true, message: '请选择物料代码', trigger: 'change' }
+  //   { required: true, message: '请选择品番', trigger: 'change' }
   // ],
   // batch: [
   //   { required: true, message: '请输入批次', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
index c0d765bc2..29f62a0a5 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
@@ -364,7 +364,7 @@ export const OfflinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -408,7 +408,7 @@ export const OfflinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -416,7 +416,7 @@ export const OfflinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -424,7 +424,7 @@ export const OfflinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -495,7 +495,7 @@ export const OfflinesettlementRecordDetailRules= reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
index 946955233..22515f168 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
@@ -402,7 +402,7 @@ export const OfflinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -450,7 +450,7 @@ export const OfflinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema
     isForm: false
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -458,7 +458,7 @@ export const OfflinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -466,7 +466,7 @@ export const OfflinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -579,6 +579,6 @@ export const OfflinesettlementRequestDetailRules = reactive({
     { required: true, message: '请选择库位代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
 })
\ No newline at end of file
diff --git a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
index 523d2d328..68bb9c74a 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
@@ -22,7 +22,7 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -290,7 +290,7 @@ export const ProcessproductionRecordDetail = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '子物料代码',
+    label: '子品番',
     field: 'componentItemCode',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
index ec58a5902..edbc64f75 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
@@ -20,7 +20,7 @@ import { fa } from 'element-plus/es/locale'
 export const BalanceBom = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -240,7 +240,7 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -252,7 +252,7 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -497,7 +497,7 @@ const validateScrapQuantity= (rule: any, value: any, callback: any) => {
 }
 // 表单校验
 export const ProcessproductionRequestMainRules = reactive({
-  itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
+  itemCode: [{ required: true, message: '品番不能为空', trigger: 'change' }],
   completedQuantity: [
     { required: true, message: '完工数量不能为空', trigger: 'change' },
     { validator: validateCompletedQuantity, trigger: 'change' }
@@ -534,7 +534,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'productionLineCode', // 查询弹窗赋值字段
         searchTitle: '生产线物料关系信息', // 查询弹窗标题
         searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -542,7 +542,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
         searchCondition: [{
           key:'itemCode',
           value:'itemCode',
-          message: '请选择物料代码！',
+          message: '请选择品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -563,7 +563,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
       multiple:true,
       disabled:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'productionLineCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -571,7 +571,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
       searchCondition: [{
         key:'itemCode',
         value:'itemCode',
-        message: '请选择物料代码！',
+        message: '请选择品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -654,7 +654,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '子物料代码',
+    label: '子品番',
     field: 'componentItemCode',
     sort: 'custom',
     isSearch: false,
@@ -664,7 +664,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     tableForm:{
       // enterSearch: true,
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择子物料代码',
+      searchListPlaceholder: '请选择子品番',
       searchField: 'componentItemCode',
       searchTitle: '库存余额物料清单信息',
       searchAllSchemas: BalanceBom.allSchemas,
@@ -672,7 +672,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
       searchCondition: [{
         key:'productItemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -693,7 +693,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择子物料代码',
+        searchListPlaceholder: '请选择子品番',
         searchField: 'componentItemCode',
         searchTitle: '库存余额物料清单信息',
         searchAllSchemas: BalanceBom.allSchemas,
@@ -701,7 +701,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
         searchCondition: [{
           key:'productItemCode',
           value:'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -721,7 +721,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     // tableForm: {
     //   enterSearch: true,
     //   isInpuFocusShow: true,
-    //   searchListPlaceholder: '请选择子物料代码版本', // 输入框占位文本
+    //   searchListPlaceholder: '请选择子品番版本', // 输入框占位文本
     //   searchField: 'componentItemCode', // 查询弹窗赋值字段
     //   searchTitle: '物料清单信息', // 查询弹窗标题
     //   searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
@@ -729,7 +729,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     //   searchCondition: [{
     //     key:'productItemCode',
     //     value:'itemCode',
-    //     message: '请填写物料代码！',
+    //     message: '请填写品番！',
     //     isMainValue: true
     //   },{
     //     key: 'available',
@@ -758,7 +758,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     //     searchCondition: [{
     //       key:'productItemCode',
     //       value:'itemCode',
-    //       message: '请填写物料代码！',
+    //       message: '请填写品番！',
     //       isMainValue: true
     //     },{
     //       key: 'available',
@@ -1063,7 +1063,7 @@ export const ProcessproductionRequestDetailRules = reactive({
     { required: true, message: '请选择库位代码', trigger: 'change' }
   ],
   componentItemCode:[
-    { required: true, message: '请选择子物料代码', trigger: 'change' }
+    { required: true, message: '请选择子品番', trigger: 'change' }
   ],
   componentItemcodeQty:[
     { required: true, message: '请输入子物料数量', trigger: 'change' }
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
index f44ac6612..c6b083484 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
@@ -715,7 +715,7 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -723,7 +723,7 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -731,7 +731,7 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -739,7 +739,7 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -879,7 +879,7 @@ export const ProductdismantleJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
index c3c647c65..349b1a151 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
@@ -142,7 +142,7 @@ const buttonBaseClickBom = async (val) => {
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
        masterId: row.masterId
     }
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
index 1a2d394a4..c4db0d04e 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
@@ -515,7 +515,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -524,7 +524,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -532,7 +532,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -540,7 +540,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -678,7 +678,7 @@ export const ProductdismantleRecordDetailaRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -841,7 +841,7 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -900,7 +900,7 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -916,7 +916,7 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -932,7 +932,7 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1040,7 +1040,7 @@ export const DismantleRecordDetailbRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 2ef30eb73..4452089e8 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -202,13 +202,13 @@ const buttonBaseClickBom = async (val) => {
 // 新增 tableform bom 按钮事件
 const buttonOperationClick = async (row, label, index)=> {
   if (row.itemCode == '') {
-    message.warning('请选择物料代码！')
+    message.warning('请选择品番！')
     return
   }
   detatableDataBom.params.itemCode = row.itemCode
   detatableDataBom.params.bomVersion = row.bomVersion
   detatableDataBom.params.masterId = ''
-  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
+  DialogTitle.value = '品番:【' + row.itemCode + '】 Bom 信息'
   detailQty.value = row.qty
   bomModelVisible.value = true
   await getDetailListBom()
@@ -238,7 +238,7 @@ const buttonOperationClick = async (row, label, index)=> {
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
        itemCode: row.itemCode,
        bomVersion: row.bomVersion,
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 09456c5df..5c6cba80d 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -691,7 +691,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -699,7 +699,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '库存余额信息',
       searchAllSchemas: BalancePopWindow.allSchemas,
@@ -709,7 +709,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: BalancePopWindow.allSchemas,
@@ -911,7 +911,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -921,7 +921,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -931,7 +931,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1069,7 +1069,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       searchCondition: [{
         key:'productItemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -1089,7 +1089,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
         searchCondition: [{
           key:'productItemCode',
           value:'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -1133,7 +1133,7 @@ export const ProductdismantleRequestDetailaRules = reactive({
     { required: true, message: '请选择工位代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   bomVersion: [
     { required: true, message: '请选择Bom版本', trigger: 'change' }
@@ -1172,7 +1172,7 @@ export const DismantleRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1216,7 +1216,7 @@ export const DismantleRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1224,7 +1224,7 @@ export const DismantleRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1232,7 +1232,7 @@ export const DismantleRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1297,7 +1297,7 @@ export const DismantleRequestDetailbRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -1324,7 +1324,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     tableForm:{
       disabled: true
@@ -1431,7 +1431,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isTable: false,
@@ -1443,7 +1443,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     isTable: false,
@@ -1455,7 +1455,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     isTable: false,
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 72559f15b..c0dd437d6 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -150,6 +150,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             console.log(res)
             if(res?.list?.length>0){
               newRow['bomVersion'] = res.list[0].version
+            } else {
+              newRow['bomVersion'] = "1"
             }
           }) 
           tableData.value.push(newRow)
@@ -348,6 +350,9 @@ const buttonTableClick = async (val, row) => {
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
+    }).finally(() =>{
+      tableObject.loading = false
+      getList()
     })
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
@@ -419,12 +424,19 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要生成备料计划吗？')
     tableObject.loading = true
-    await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
+    await ProductionMainApi.generatePreparetoissue(row.number).then((res) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       buttonBaseClick('refresh',null)
       // 生成发料申请
-      ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
+      if (Array.isArray(res) && res.length > 0) {
+        res.forEach(item => {
+          // 已发布
+          if(item.status == '6'){
+            ProductionMainApi.generateIssueRequest(item.number)
+          }
+        });
+      }
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -469,10 +481,16 @@ const autoCreatePlanRequest = async (row)=>{
   try {
     if(planSwitch.value) {
       // /generatePreparetoissue?number
-      let PreparetoissueRes = await  ProductionMainApi.generatePreparetoissue(row.number)
+      let res = await  ProductionMainApi.generatePreparetoissue(row.number)
       // 生成发料申请
-      // generateIssueRequest
-      ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
+      if (Array.isArray(res) && res.length > 0) {
+        res.forEach(item => {
+          // 已发布
+          if(item.status == '6'){
+            ProductionMainApi.generateIssueRequest(item.number)
+          }
+        });
+      }
     }
   } finally {
     try {
@@ -597,8 +615,10 @@ const submitForm = async (formType, submitData) => {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
       await ProductionMainApi.createProductionMain(data).then((res) => {
-        if (res.status == '6') {
-          autoCreatePlanRequest(res)
+        if (Array.isArray(res) && res.length > 0) {
+          res.forEach(item => {
+            autoCreatePlanRequest(item);
+          });
         }
        message.success(t('common.createSuccess'))
       })
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index e6408c0b3..651f29fe9 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -12,7 +12,7 @@ import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
 import * as TeamApi from '@/api/wms/team'
 import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
-import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import { Productionlineitem, ProductionlineitemInfo } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 import * as BomApi from '@/api/wms/bom'
 import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 
@@ -43,6 +43,17 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortSearchDefault:1,
+  },
+  {
+    label: '客户订单号',
+    field: 'customerOrderNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+    sortSearchDefault: 2,
   },
   {
     label: '计划类型',
@@ -80,6 +91,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     //   }
     // },
     isSearch: true,
+    sortSearchDefault: 3,
   },
   {
     label: '顺序',
@@ -168,7 +180,9 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true,
         }], // 失去焦点校验参数
       }
-    }
+    },
+    isSearch:true,
+    sortSearchDefault: 6,
   },
   {
     label: '班组',
@@ -237,7 +251,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   // {
-  //   label: '物料代码',
+  //   label: '品番',
   //   field: 'detailItemCode',
   //   sort: 'custom',
   //   isSearch: true,
@@ -276,7 +290,9 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    sortTableDefault:1000,
+    sortTableDefault: 1000,
+    sortSearchDefault: 4,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -298,7 +314,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    sortTableDefault:1000,
+    sortTableDefault: 1000,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -320,7 +336,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    sortTableDefault:1000,
+    sortTableDefault: 1000,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -446,6 +462,8 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isTable: false,
     isForm: false,
   },
@@ -459,6 +477,16 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false,
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 350
+    },
+    isTable: false,
+    isForm: false,
+  },
   // {
   //   label: '开始时间',
   //   field: 'beginTime',
@@ -553,6 +581,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: true,
+    sortTableDefault: 1000,
     isForm: false,
   },
   {
@@ -567,6 +596,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isTable: true,
+    sortTableDefault: 1000,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -577,7 +607,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -638,6 +668,10 @@ export const ProductionMainRules = reactive({
     { required: true, message: '请输入顺序', trigger: 'blur' },
     // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  customerOrderNumber: [
+    { required: true, message: '请输入客户订单号', trigger: 'blur' },
+    { max: 10, message: '不得超过10个字符', trigger: 'blur' }
+  ],
   workshop: [
     { required: true, message: '请选择车间', trigger: 'change' }
   ],
@@ -675,7 +709,7 @@ export const ProductionMainRules = reactive({
  */
 export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -686,10 +720,10 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '生产线物料关系信息', // 查询弹窗标题
-        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: ProductionlineitemInfo.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key:'productionLineCode',
@@ -704,14 +738,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
 
       }
     },
+    sortSearchDefault: 5,
     tableForm:{
       multiple:true,
       disabled:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
-      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchAllSchemas: ProductionlineitemInfo.allSchemas, // 查询弹窗所需类
       searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
       searchCondition: [{
         key:'productionLineCode',
@@ -737,7 +772,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -752,6 +787,39 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch:true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '车型',
+    field: 'vehicleType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: 'Bom版本',
     field: 'bomVersion',
@@ -759,10 +827,13 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isTable: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
         searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
         searchField: 'version', // 查询弹窗赋值字段
         searchTitle: '物料清单信息', // 查询弹窗标题
@@ -771,7 +842,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key:'productItemCode',
           value:'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -780,8 +851,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
         }]
       }
     },
-    tableForm:{
-      isInpuFocusShow: true,
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: false,
       searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
       searchField: 'version', // 查询弹窗赋值字段
       searchTitle: '物料清单信息', // 查询弹窗标题
@@ -790,7 +862,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchCondition: [{
         key:'productItemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -799,40 +871,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
   },
-  {
-    label: '计划日期',
-    field: 'planDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 120
-    },
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isSearch: true,
-    isTableForm: false,
-    isForm: false,
-    // hiddenInMain: true,
-    sortTableDefault:1000,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-  },
+  
   {
     label: '计划数量',
     field: 'planQty',
@@ -860,7 +899,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -878,6 +917,40 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       dictClass: 'string'
     }
   },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
+    isTableForm: false,
+    isForm: false,
+    // hiddenInMain: true,
+    sortSearchDefault: 4,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '合格数量',
     field: 'goodQty',
@@ -1083,7 +1156,7 @@ export const ProductionDetailRules = reactive({
     { required: true, message: '请输入计划数量', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index cf2699d27..7cee42437 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -148,6 +148,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
               console.log(res)
               if(res?.list?.length>0){
                 newRow['bomVersion'] = res.list[0].version
+              } else {
+                newRow['bomVersion'] = "1"
               }
             }) 
           tableData.value.push(newRow)
@@ -161,13 +163,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField == 'workshop'){
         setV['workshop'] = val[0]['code']
         setV['productionLine'] = ''
-        if(tableData.value){
-          tableData.value.forEach(item => {
-            item.itemCode =''
-            item.bomVersion = ''
-            item.uom = ''
-          })
-        }
+         tableData.value =[]
+      }else if(formField == 'productionLine'){
+        setV['productionLine'] = val[0]['code']
+        tableData.value =[]
       }else{
         setV[formField] = val[0][searchField]
       }
@@ -351,6 +350,9 @@ const buttonTableClick = async (val, row) => {
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
+    }).finally(() =>{
+      tableObject.loading = false
+      getList()
     })
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
@@ -423,12 +425,19 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要生成备料计划吗？')
     tableObject.loading = true
-    await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
+    await ProductionMainApi.generatePreparetoissue(row.number).then((res) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
       buttonBaseClick('refresh',null)
       // 生成发料申请
-      ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
+      if (Array.isArray(res) && res.length > 0) {
+        res.forEach(item => {
+          // 已发布
+          if(item.status == '6'){
+            ProductionMainApi.generateIssueRequest(item.number)
+          }
+        });
+      }
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -603,11 +612,16 @@ const autoCreatePlanRequest = async (row)=>{
   try {
     
     if(planSwitch.value) {
-      // /generatePreparetoissue?number
-      let PreparetoissueRes = await  ProductionMainApi.generatePreparetoissue(row.number)
+      let res = await  ProductionMainApi.generatePreparetoissue(row.number)
       // 生成发料申请
-      // generateIssueRequest
-      ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
+      if (Array.isArray(res) && res.length > 0) {
+        res.forEach(item => {
+          // 已发布
+          if(item.status == '6'){
+            ProductionMainApi.generateIssueRequest(item.number)
+          }
+        });
+      }
     }
   } finally {
     try {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 303c4db48..d53f82e56 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -12,7 +12,7 @@ import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
 import * as TeamApi from '@/api/wms/team'
 import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
-import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+import { Productionlineitem, ProductionlineitemInfo } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 import * as BomApi from '@/api/wms/bom'
 import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 
@@ -43,6 +43,17 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortSearchDefault: 1,
+  },
+  {
+    label: '客户订单号',
+    field: 'customerOrderNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+    sortSearchDefault: 2,
   },
   {
     label: '计划类型',
@@ -80,6 +91,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     //   }
     // },
     isSearch: true,
+    sortSearchDefault: 3,
   },
   {
     label: '顺序',
@@ -167,7 +179,9 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true,
         }], // 失去焦点校验参数
       }
-    }
+    },
+    isSearch: true,
+    sortSearchDefault: 6,
   },
   {
     label: '班组',
@@ -236,7 +250,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   // {
-  //   label: '物料代码',
+  //   label: '品番',
   //   field: 'detailItemCode',
   //   sort: 'custom',
   //   isSearch: true,
@@ -275,7 +289,9 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    sortTableDefault:1000,
+    sortTableDefault: 1000,
+    sortSearchDefault: 4,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -553,6 +569,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: true,
     isForm: false,
+    sortTableDefault: 1000,
   },
   {
     label: '创建时间',
@@ -576,7 +593,8 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
-    isSearch: true,
+    isSearch: false,
+    sortTableDefault: 1000,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -637,6 +655,10 @@ export const ProductionMainRules = reactive({
     { required: true, message: '请输入顺序', trigger: 'blur' },
     // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  customerOrderNumber: [
+    { required: true, message: '请输入客户订单号', trigger: 'blur' },
+    { max: 10, message: '不得超过10个字符', trigger: 'blur' }
+  ],
   workshop: [
     { required: true, message: '请选择车间', trigger: 'change' }
   ],
@@ -674,21 +696,22 @@ export const ProductionMainRules = reactive({
  */
 export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
     table: {
       width: 150
     },
+    sortSearchDefault: 5,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '生产线物料关系信息', // 查询弹窗标题
-        searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: ProductionlineitemInfo.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key:'productionLineCode',
@@ -707,10 +730,10 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true,
       // enterSearch:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
-      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchAllSchemas: ProductionlineitemInfo.allSchemas, // 查询弹窗所需类
       searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
       searchCondition: [{
         key:'productionLineCode',
@@ -736,7 +759,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -751,6 +774,39 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch:true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '车型',
+    field: 'vehicleType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: 'Bom版本',
     field: 'bomVersion',
@@ -758,6 +814,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+
+    isTableForm: false,
+    isTable: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -770,7 +829,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key:'productItemCode',
           value:'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -789,7 +848,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchCondition: [{
         key:'productItemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -798,40 +857,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     },
   },
-  {
-    label: '计划日期',
-    field: 'planDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 120
-    },
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isSearch: true,
-    isTableForm: false,
-    isForm: false,
-    // hiddenInMain: true,
-    sortTableDefault:1000,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-  },
+ 
   {
     label: '计划数量',
     field: 'planQty',
@@ -843,14 +869,14 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        max:9999,
+        max: 9999,
         // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      max:9999,
+      max: 9999,
       // precision: 6
     },
   },
@@ -859,7 +885,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -874,6 +900,40 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: true,
+    isTableForm: false,
+    isForm: false,
+    // hiddenInMain: true,
+    sortSearchDefault: 4,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '完工数量',
     field: 'goodQty',
@@ -969,6 +1029,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     hiddenInMain: true,
+    isTableForm:false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -1079,7 +1140,7 @@ export const ProductionDetailRules = reactive({
     { required: true, message: '请输入计划数量', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 5f1d7a00b..79286db72 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index ce8b1db9e..3aca21274 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -236,7 +236,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   // {
-  //   label: '物料代码',
+  //   label: '品番',
   //   field: 'detailItemCode',
   //   sort: 'custom',
   //   isSearch: true,
@@ -676,7 +676,7 @@ export const ProductionMainRules = reactive({
  */
 export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -687,7 +687,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '生产线物料关系信息', // 查询弹窗标题
         searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -707,7 +707,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -736,7 +736,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -765,7 +765,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key:'productItemCode',
           value:'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -784,7 +784,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchCondition: [{
         key:'productItemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -1036,7 +1036,7 @@ export const ProductionDetailRules = reactive({
     { required: true, message: '请输入计划数量', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index a75670988..f20ed9e58 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 11019d913..d8c232a23 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -233,7 +233,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   // {
-  //   label: '物料代码',
+  //   label: '品番',
   //   field: 'detailItemCode',
   //   sort: 'custom',
   //   isSearch: true,
@@ -663,7 +663,7 @@ export const ProductionMainRules = reactive({
  */
 export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -674,7 +674,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '生产线物料关系信息', // 查询弹窗标题
         searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -696,7 +696,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       enterSearch:true,
       // isInpuFocusShow: true,
       disabled:true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -724,7 +724,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -753,7 +753,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key:'productItemCode',
           value:'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -772,7 +772,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchCondition: [{
         key:'productItemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -1022,7 +1022,7 @@ export const ProductionDetailRules = reactive({
     { required: true, message: '请输入计划数量', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
index adcda4b32..0faff37ec 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
index 97e776d34..9409a6cac 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
@@ -19,7 +19,16 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '客户订单号',
+    field: 'customerOrderNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -27,6 +36,22 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '计划数量',
     field: 'planQty',
diff --git a/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
index 0f1be4649..965dc4505 100644
--- a/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
@@ -322,7 +322,7 @@ export const WorkDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -330,7 +330,7 @@ export const WorkDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'code',
       searchTitle: '物料基础信息',
       searchAllSchemas: Itembasic.allSchemas,
@@ -340,7 +340,7 @@ export const WorkDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'code',
         searchTitle: '物料基础信息',
         searchAllSchemas: Itembasic.allSchemas,
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index 5a48e1134..4a0a9d587 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -665,7 +665,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -673,7 +673,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -764,7 +764,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -773,7 +773,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemdesc2',
     sort: 'custom',
     table: {
@@ -894,7 +894,7 @@ export const ProductputawayJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
index b38e6b264..028a82482 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
@@ -448,7 +448,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   //   sortTableDefault:2,
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -457,7 +457,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:3,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     // table: {
@@ -659,7 +659,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain: true
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -668,7 +668,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -785,7 +785,7 @@ export const ProductputawayRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index 34f643eb6..07180901c 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -456,7 +456,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   isTableForm: false,
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -467,7 +467,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       // isInpuFocusShow: true,
       disabled:true,
       isSearchList: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -481,7 +481,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -494,7 +494,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -673,7 +673,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -684,7 +684,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -830,6 +830,6 @@ export const ProductputawayRequestDetailRules = reactive({
   //   { required: true, message: '请输入从库位代码', trigger: 'blur' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { 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 3d7ca5bf4..eae69c4c0 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
@@ -634,7 +634,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -642,7 +642,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -720,7 +720,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -729,7 +729,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemdesc2',
     sort: 'custom',
     table: {
@@ -859,7 +859,7 @@ export const ProductputawayJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
index bdbb1e4ed..6169e03f5 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
@@ -448,7 +448,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:2,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -457,7 +457,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:3,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -672,7 +672,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
 
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -682,7 +682,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
 
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -801,7 +801,7 @@ export const ProductputawayRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index 3c34edd73..b950706e6 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -448,7 +448,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -459,7 +459,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       // isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
       disabled:true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -469,7 +469,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -478,7 +478,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -670,7 +670,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
 
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -681,7 +681,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -811,6 +811,6 @@ export const ProductputawayRequestDetailRules = reactive({
   //   { required: true, message: '请输入从库位代码', trigger: 'blur' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index bc10aba3e..fc509a2c3 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -151,7 +151,7 @@ const searchTableParams = ref([
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       masterId: row.masterId
     }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 3b8b113a6..7aa355a1d 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -834,7 +834,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sortTableDefault:1000,
     sort: 'custom',
@@ -843,7 +843,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sortTableDefault:1001,
     sort: 'custom',
@@ -852,17 +852,37 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
-    isTable:false,
-    hiddenInMain:true,
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
+    sortTableDefault: 1001,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   isTable:false,
+  //   hiddenInMain:true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     isTable:false,
     hiddenInMain:true,
@@ -1018,7 +1038,7 @@ export const ProductreceiptJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 375776ab8..acb4c66e0 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -45,7 +45,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -432,7 +432,7 @@ const tableFormButton = async (val, row) => {
   if (val == 'bom') {
     // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       number: row.number
     }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index ae838e066..4e8429631 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -492,7 +492,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -500,7 +500,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -508,15 +508,34 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch:true,
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -794,7 +813,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false ,
     table: {
-      width: 410,
+      width: 250,
       fixed: 'right'
     },
     isTableForm:true,
@@ -846,7 +865,7 @@ export const ProductreceiptRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -936,7 +955,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -980,7 +999,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -988,7 +1007,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -996,7 +1015,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1083,7 +1102,7 @@ export const BackflushRecordDetailbRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index a4f881979..257b5b282 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -75,8 +75,8 @@
     <template v-slot="{ row }">
       <el-date-picker
         v-bind:modelValue="
-          row['expireTime']
-            ? addDay(row['produceDate'], row['expireTime'])
+          row['validityDays']
+            ? addDay(new Date(), row['validityDays'])
             : dayjs('2099-12-31').valueOf()
         "
         :clearable="true"
@@ -260,6 +260,9 @@ const onChange = (field, cur) => {
 
   }
 }
+function addDay(date: Date | number, addDay: number) {
+  return dayjs(date).add(addDay, 'day')
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
@@ -559,6 +562,8 @@ const buttonTableClick = async (val, row) => {
     // 创建标签
 
     // 判断 是否已创建标签
+    tableObject.loading = true
+    try {
     let isCreateLabel = false
     await PackageApi.getPackagePage({
       requestNumber: row.number
@@ -569,6 +574,7 @@ const buttonTableClick = async (val, row) => {
     })
     if (isCreateLabel) {
       message.warning('已创建过标签！！！')
+      tableObject.loading = false
       return
     }
     detatableData.params = {
@@ -620,7 +626,7 @@ const buttonTableClick = async (val, row) => {
             })
           }
         } else {
-          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          message.warning('没有查询到品番：【' + item.itemCode + '】')
           return
         }
       })
@@ -638,6 +644,9 @@ const buttonTableClick = async (val, row) => {
           row['disabled_batch'] = true
         }
     })
+    }finally {
+      tableObject.loading = false
+    }
   } else if (val == 'mainHandle') {
     // 处理
     // 判断 是否已创建标签
@@ -859,25 +868,20 @@ const submitFormLabel = async (formType, submitData) => {
   if (data.masterId) {
     data.id = data.masterId
   }
-  try {
-    console.log('aaaaa', data)
-    data.subList = detatableData.tableList
-    console.log('bbbbb', data)
-    // 创建标签 要物料库区配置表中 入库包装规格
-    await ProductreceiptRequestMainApi.productCreateLabel(data)
-      .then((res) => {
-        isCreateLabel.value = true
-        message.success('创建标签成功')
-      })
-      .catch((err) => {
-        isCreateLabel.value = false
-        console.log(err)
-        message.error('创建标签失败')
-      })
-  } finally {
+  formLabelRef.value.formLoading = true
+  data.subList = detatableData.tableList
+  // 创建标签 要物料库区配置表中 入库包装规格
+  await ProductreceiptRequestMainApi.productCreateLabel(data).then((res) => {
+    isCreateLabel.value = true
+    message.success('创建标签成功')
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
-  }
+  }).catch((err) => {
+    isCreateLabel.value = false
+    console.log(err)
+    message.error('创建标签失败')
+    formLabelRef.value.formLoading = false
+  })
 }
 
 // 查看 Bom 按钮回调事件
@@ -885,7 +889,7 @@ const tableFormButton = async (val, row) => {
   if (val == 'bom') {
     // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       number: row.number
     }
@@ -957,7 +961,7 @@ const labelPrint = async (row) => {
 
   // 获得表格的各种操作
   const { getList: getListPrint } = tableMethods
-  getListPrint()
+  await getListPrint()
   tableObject.loading = false
   const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
@@ -978,14 +982,18 @@ const searchTableSuccessLabel = async (formField, searchField, val, formRef, typ
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-let array = []//存储可采购数据
+ let array = []//存储可采购数据
+  let arrayTool = []//存储可采购协定品数据
   let array1 = []//存储可制造数据
     let packingNumbers = []
   val.forEach((item,index) => {
     packingNumbers.push(item.number)
-   
     if (item.itemType == '可采购') {
-      array.push(item)
+      if (item.itemBasicType =='TOOL') {
+        arrayTool.push(item)
+      } else {
+        array.push(item)
+      }
     }
     if (item.itemType == '可制造') {
       array1.push(item)
@@ -999,6 +1007,16 @@ let array = []//存储可采购数据
       console.log(err)
       message.error('创建标签失败')
     })
+  }
+   // 打印协定品采购件
+  if (arrayTool.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:arrayTool.map(item1=>item1.number)}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
   }
   if (array1.length > 0) {
     await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 4c5369f59..e883644bc 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -960,7 +960,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     sortTableDefault: 1003,
@@ -972,7 +972,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true,
       multiple: true,
       isInpuFocusShow: false,
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '生产线物料关系信息',
       searchAllSchemas: Productionlineitem.allSchemas,
@@ -1004,7 +1004,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '生产线物料关系信息',
         searchAllSchemas: Productionlineitem.allSchemas,
@@ -1030,6 +1030,26 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+    isForm: false,
+    sortTableDefault: 1003,
+    sortSearchDefault: 5,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: 'Bom版本',
     field: 'bomVersion',
@@ -1048,7 +1068,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key: 'productItemCode',
         value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       }, {
         key: 'available',
@@ -1068,7 +1088,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchCondition: [{
           key: 'productItemCode',
           value: 'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         }, {
           key: 'available',
@@ -1088,7 +1108,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     sortTableDefault: 1005,
@@ -1098,20 +1118,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   hiddenInMain: true,
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
   {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    hiddenInMain: true,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     hiddenInMain: true,
     isTable: false,
@@ -1342,7 +1362,7 @@ export const ProductreceiptRequestDetailRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   bomVersion: [
     { required: true, message: '请选择Bom版本', trigger: 'change' }
@@ -1382,7 +1402,7 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1426,7 +1446,7 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1434,7 +1454,7 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1442,7 +1462,7 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1515,7 +1535,7 @@ export const BackflushRequestDetailbRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -1555,7 +1575,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1565,7 +1585,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1575,7 +1595,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1585,7 +1605,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1704,7 +1724,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
  */
 export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1719,6 +1739,22 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '批次',
     field: 'batch',
@@ -1770,74 +1806,93 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-
-      }
-    },
-    tableForm: {
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
+   {
+        label: '包装规格',
+        field: 'packUnit',
+        sort: 'custom',
+        isSearch: false,
+        table: {
+          width: 120
         },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    },
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
+        isTable: false,
+        isTableForm: true,
+        isForm: true,
+        tableForm: {
+          enterSearch: true,
+          isInpuFocusShow: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+          searchField: 'packUnit', // 查询弹窗赋值字段
+          searchTitle: '物料包装信息', // 查询弹窗标题
+          searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+          searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'itemCode',
+              value: 'itemCode',
+              message: '请先选择品番！',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'packUnit',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        },
+        form: {
+          // labelMessage: '信息提示说明！！！',
+          componentProps: {
+            isSearchList: true, // 开启查询弹窗
+            searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+            searchField: 'packUnit', // 查询弹窗赋值字段
+            searchTitle: '物料包装信息', // 查询弹窗标题
+            searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+            searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+            searchCondition: [
+              {
+                key: 'available',
+                value: 'TRUE',
+                isMainValue: false
+              },
+              {
+                key: 'itemCode',
+                value: 'itemCode',
+                message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
+                isMainValue: true
+              }
+            ],
+            verificationParams: [
+              {
+                key: 'packUnit',
+                action: '==',
+                value: '',
+                isMainValue: false,
+                isSearch: true,
+                isFormModel: true
+              }
+            ] // 失去焦点校验参数
+          }
+        }
+      },
+      {
+        label: '包装数量',
+        field: 'packQty',
+        sort: 'custom',
+        table: {
+          width: 150
+        }
+      },
   {
     label: '标签生产线代码',
     field: 'productionLineCodePackage',
@@ -1915,14 +1970,14 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       searchCondition: [{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       }]
     }
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1932,7 +1987,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1942,7 +1997,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -2139,5 +2194,11 @@ export const ProductreceiptRequestLabelRules = reactive({
   batch: [
     { required: true, message: '请选择批次', trigger: ['change','blur'] }
   ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: ['change','blur'] }
+  ],
 })
 
diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
index a41ef3d2e..117455153 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
index 3623500ae..f1a792b40 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
@@ -23,7 +23,7 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
     isSearch: true,
   },
   {
-    label: '成品物料代码',
+    label: '成品品番',
     field: 'finishedItemCode',
     sort: 'custom',
     isSearch: true,
@@ -129,7 +129,7 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '原料物品代码',
+    label: '原料品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -137,7 +137,7 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
     },
   },
   {
-    label: '原料物品名称',
+    label: '原料品名',
     field: 'itemName',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
index 4a8c401c4..d0d63970f 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index bed0e1d08..38da4828e 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -835,7 +835,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sortTableDefault:1000,
     sort: 'custom',
@@ -844,7 +844,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sortTableDefault:1001,
     sort: 'custom',
@@ -853,17 +853,37 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
-    isTable:false,
-    hiddenInMain:true,
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
+    sortTableDefault: 1001,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   isTable:false,
+  //   hiddenInMain:true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     isTable:false,
     hiddenInMain:true,
@@ -1007,7 +1027,7 @@ export const ProductreceiptJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index aaabd87ad..f72f14483 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -421,7 +421,7 @@ const searchFormClick = (searchData) => {
 const tableFormButton = async (val , row) => {
   if (val == 'mes') { // 查看 bom
     mesModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Mes信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Mes信息'
     detatableDataMes.params = {
       masterId: row.id
     }
@@ -429,7 +429,7 @@ const tableFormButton = async (val , row) => {
   }
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    BomDialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    BomDialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       number: row.number
     }
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
index e3b004cc2..6557b14f6 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -496,7 +496,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -504,7 +504,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -512,15 +512,34 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -797,7 +816,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false ,
     table: {
-      width: 410,
+      width: 250,
       fixed: 'right'
     },
     hiddenInMain: false,
@@ -850,7 +869,7 @@ export const ProductreceiptRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -940,7 +959,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -984,7 +1003,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -992,7 +1011,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1000,7 +1019,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1087,7 +1106,7 @@ export const BackflushRecordDetailbRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -1132,13 +1151,13 @@ export const ProductreceiptDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isSearch: true,
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 3ab14a670..07eb65030 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -445,6 +445,8 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'cjbq') { // 创建标签
 
     // 判断 是否已创建标签
+      tableObject.loading = true
+    try {
     let isCreateLabel = false
     await PackageApi.getPackagePage({
       requestNumber: row.number
@@ -506,7 +508,7 @@ const buttonTableClick = async (val, row) => {
           })
           }
         } else {
-          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          message.warning('没有查询到品番：【' + item.itemCode + '】')
           return
         }
       })
@@ -524,7 +526,9 @@ const buttonTableClick = async (val, row) => {
         }
      })  
     })
-
+ }finally {
+      tableObject.loading = false
+    }
   } else if (val == 'mainHandle') { // 处理
     tableObject.loading = true
     // 判断 是否已创建标签
@@ -725,29 +729,28 @@ const submitFormLabel = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  try {
-    console.log("aaaaa",data);
-    data.subList=detatableData.tableList
-    console.log("bbbbb",data);
-    await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => {
-      isCreateLabel.value = true
-      message.success('创建标签成功')
-    }).catch(err => {
-      isCreateLabel.value = false
-      console.log(err)
-      message.error('创建标签失败')
-    })
-  } finally {
+ 
+  formLabelRef.value.formLoading = true
+  data.subList=detatableData.tableList
+  await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => {
+    isCreateLabel.value = true
+    message.success('创建标签成功')
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
-  }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+    formLabelRef.value.formLoading = false
+    message.error('创建标签失败')
+  })
+  
 }
 
 // 查看 Bom 按钮回调事件
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       number: row.number
     }
@@ -815,7 +818,7 @@ const labelPrint = async (row) => {
 
   // 获得表格的各种操作
   const { getList:getListPrint } = tableMethods
-  getListPrint()
+  await getListPrint()
   tableObject.loading = false
   const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
@@ -840,14 +843,18 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-let array = []//存储可采购数据
+  let array = []//存储可采购数据
+  let arrayTool = []//存储可采购协定品数据
   let array1 = []//存储可制造数据
-    let packingNumbers = []
+  let packingNumbers = []
   val.forEach((item,index) => {
     packingNumbers.push(item.number)
-   
     if (item.itemType == '可采购') {
-      array.push(item)
+      if (item.itemBasicType =='TOOL') {
+        arrayTool.push(item)
+      } else {
+        array.push(item)
+      }
     }
     if (item.itemType == '可制造') {
       array1.push(item)
@@ -861,6 +868,16 @@ let array = []//存储可采购数据
       console.log(err)
       message.error('创建标签失败')
     })
+  }
+    // 打印协定品采购件
+  if (arrayTool.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:arrayTool.map(item1=>item1.number)}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
   }
   if (array1.length > 0) {
     await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 9a7df4d64..48847f519 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -1,6 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
@@ -26,7 +26,7 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
 import * as BomApi from '@/api/wms/bom'
 import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 
-import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
 
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
@@ -36,584 +36,610 @@ const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'ProductReceiptRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'ProductReceiptRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- export const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
- console.log('shiftList',shiftList)
- // 获取当前操作人的部门
- 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]
+export const shiftList = await ShiftApi.getShiftPage({
+  available: 'TRUE',
+  pageSize: 500,
+  pageNo: 1,
+  sort: '',
+  by: 'ASC'
+})
+console.log('shiftList', shiftList)
+// 获取当前操作人的部门
+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} 制品收货申请主表
  */
-export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    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
+export const ProductreceiptRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      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',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true,
-    isForm: false,
-    isTable:true,
-  },
-  {
-    label: '车间代码',
-    field: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择车间',
-        searchField: 'code',
-        searchTitle: '车间信息',
-        searchAllSchemas: Workshop.allSchemas,
-        searchPage: WorkshopApi.getWorkshopPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+    },
+    {
+      label: '生产计划单号',
+      field: 'productionPlanNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true,
+      isForm: false,
+      isTable: true
+    },
+    {
+      label: '车间代码',
+      field: 'workshopCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择车间',
+          searchField: 'code',
+          searchTitle: '车间信息',
+          searchAllSchemas: Workshop.allSchemas,
+          searchPage: WorkshopApi.getWorkshopPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    tableForm: {
-      enterSearch: true,
-      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
-        }],
-      verificationParams: [{
-        key: 'code',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
+    },
+    {
+      label: '生产线代码',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      tableForm: {
         enterSearch: true,
-        isSearchList: true,
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择生产线代码',
         searchField: 'code',
         searchTitle: '生产线信息',
         searchAllSchemas: Productionline.allSchemas,
         searchPage: ProductionlineApi.getProductionlinePage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'type',
-          value: 'assemble',//号口品类型
-          isMainValue: false
-        },{
-          key: 'workshopCode',
-          value: 'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-          }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
-      }
-    }
-  },
-  {
-    label: '班组',
-    field: 'team',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    sortTableDefault: 1001,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择班组',
-        searchField: 'code',
-        searchTitle: '班组信息',
-        searchAllSchemas: Team.allSchemas,
-        searchPage: TeamApi.getTeamPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
-      }
-    }
-  },
-  {
-    label: '班组',
-    field: 'teamName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm:false,
-    sortTableDefault: 1001,
-  },
-  {
-    label: '班次',
-    field: 'shift',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    sortTableDefault: 1001,
-    form: {
-      component:'Select',
-      componentProps:{
-          options:shiftList.list,
-          optionsAlias: {
-            labelField: 'name',
-            valueField: 'code'
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
           },
-          verificationParams: [{
+          {
+            key: 'workshopCode',
+            value: 'workshopCode',
+            message: '请填写车间代码！',
+            isMainValue: true
+          }
+        ],
+        verificationParams: [
+          {
             key: 'code',
             action: '==',
             value: '',
             isMainValue: false,
             isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择生产线代码',
+          searchField: 'code',
+          searchTitle: '生产线信息',
+          searchAllSchemas: Productionline.allSchemas,
+          searchPage: ProductionlineApi.getProductionlinePage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'type',
+              value: 'assemble', //号口品类型
+              isMainValue: false
+            },
+            {
+              key: 'workshopCode',
+              value: 'workshopCode',
+              message: '请填写车间代码！',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '班次',
-    field: 'shiftName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    isForm:false,
-    sortTableDefault: 1001,
-    search: {
-      component:'Select',
-      componentProps:{
-          options:shiftList.list,
+    },
+    {
+      label: '班组',
+      field: 'team',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      sortTableDefault: 1001,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择班组',
+          searchField: 'code',
+          searchTitle: '班组信息',
+          searchAllSchemas: Team.allSchemas,
+          searchPage: TeamApi.getTeamPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '班组',
+      field: 'teamName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      sortTableDefault: 1001
+    },
+    {
+      label: '班次',
+      field: 'shift',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      sortTableDefault: 1001,
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: shiftList.list,
           optionsAlias: {
             labelField: 'name',
-            valueField: 'name'
+            valueField: 'code'
           },
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '收货类型',
-    field: 'type',
-    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false,
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ProductReceipt',
-      componentProps: {
-        disabled: true
+    },
+    {
+      label: '班次',
+      field: 'shiftName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      isForm: false,
+      sortTableDefault: 1001,
+      search: {
+        component: 'Select',
+        componentProps: {
+          options: shiftList.list,
+          optionsAlias: {
+            labelField: 'name',
+            valueField: 'name'
+          }
+        }
       }
     },
-    isTable: false,
-    isForm: false,
-  },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false
-  // },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '收货类型',
+      field: 'type',
+      dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+      dictClass: 'string',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        value: 'ProductReceipt',
+        componentProps: {
+          disabled: true
+        }
+      },
+      isTable: false,
+      isForm: false
+    },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false
+    // },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false,
+      isForm: false,
+      isSearch: true,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
       }
     },
-    isTable: false,
-    isForm: false,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      isForm: false
+    },
+    {
+      label: '申请时间',
+      field: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTable: false,
+      isForm: false
+    },
+    // {
+    //   label: '截止时间',
+    //   field: 'dueTime',
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       style: {width: '100%'},
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x',
+    //     }
+    //   },
+    //   isTable: 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'
+          }
+        }
+      },
+      isTable: false
     },
 
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isForm: false
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '自动提交',
+      field: 'autoCommit',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoCommit,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
     },
-    isTable: false,
-    isForm: false
-  },
-  // {
-  //   label: '截止时间',
-  //   field: 'dueTime',
-  //   formatter: dateFormatter,
-  //   detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   form: {
-  //     component: 'DatePicker',
-  //     componentProps: {
-  //       style: {width: '100%'},
-  //       type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
-  //     }
-  //   },
-  //   isTable: 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: 'autoAgree',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoAgree,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
         }
       }
     },
-    isTable: false,
-  },
-
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '自动执行',
+      field: 'autoExecute',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.autoExecute,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
     },
-    isForm: false,
-    isTable: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTable: false,
-  },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    {
+      label: '直接生成记录',
+      field: 'directCreateRecord',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: requestsettingData.directCreateRecord,
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE',
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 250,
+        fixed: 'right'
       }
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 300,
-      fixed: 'right'
-    },
-  }
-]))
+  ])
+)
 
 //表单校验
 export const ProductreceiptRequestMainRules = reactive({
-  workshopCode: [
-    { required: true, message: '请选择车间代码', trigger: 'change' }
-  ],
+  workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'change' }],
   // team: [
   //   { required: true, message: '请选择班组代码', trigger: 'change' }
   // ],
@@ -623,117 +649,83 @@ export const ProductreceiptRequestMainRules = reactive({
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
-  productionLineCode: [
-    { required: true, message: '请选择生产线代码', trigger: 'change' }
-  ],
-  autoCommit: [
-    { required: true, message: '请选择是否自动提交', trigger: 'change' }
-  ],
-  autoAgree: [
-    { required: true, message: '请选择是否自动通过', trigger: 'change' }
-  ],
-  autoExecute: [
-    { required: true, message: '请选择是否自动执行', trigger: 'change' }
-  ],
+  productionLineCode: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
+  autoCommit: [{ required: true, message: '请选择是否自动提交', trigger: 'change' }],
+  autoAgree: [{ required: true, message: '请选择是否自动通过', trigger: 'change' }],
+  autoExecute: [{ required: true, message: '请选择是否自动执行', trigger: 'change' }],
   directCreateRecord: [
     { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
   ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 制品收货申请子表
  */
-export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    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,
+export const ProductreceiptRequestDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '生产线代码',
+      field: 'productionLineCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      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
-        }]
+        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: 'workStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      enterSearch: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择工位代码',
-      searchField: 'code',
-      searchTitle: '工位信息',
-      searchAllSchemas: Workstation.allSchemas,
-      searchPage: WorkstationApi.getWorkstationPage,
-
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }, {
-        key: 'productionLineCode',
-        value: 'productionLineCode',
-        message: '请填写生产线代码！',
-        isMainValue: true
-      }],
-      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
-      verificationParams: [{
-        key: 'code',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
+    },
+    {
+      label: '工位代码',
+      field: 'workStationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
         enterSearch: true,
         isInpuFocusShow: true,
         searchListPlaceholder: '请选择工位代码',
@@ -741,1288 +733,1392 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchTitle: '工位信息',
         searchAllSchemas: Workstation.allSchemas,
         searchPage: WorkstationApi.getWorkstationPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }, {
-          key: 'productionLineCode',
-          value: 'productionLineCode',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
-      }
-    }
-  },
-  {
-    label: '工序代码',
-    field: 'processCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      enterSearch: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择工序代码',
-      searchField: 'code',
-      searchTitle: '工序信息',
-      searchAllSchemas: Process.allSchemas,
-      searchPage: ProcessApi.getProcessPage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },
-        {
-          key: 'workshopCode',
-          value: 'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },
-        // {
-        //   key: 'productionLineCode',
-        //   value: 'productionLineCode',
-        //   message: '请填写生产线代码！',
-        //   isMainValue: true
-        // }
+
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
+          {
+            key: 'productionLineCode',
+            value: 'productionLineCode',
+            message: '请填写生产线代码！',
+            isMainValue: true
+          }
         ],
-      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
-      verificationParams: [{
-        key: 'code',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
+        isRepeat: true, //tableForm下方输入框是否可以重复添加该条数据
+        verificationParams: [
+          {
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isInpuFocusShow: true,
+          searchListPlaceholder: '请选择工位代码',
+          searchField: 'code',
+          searchTitle: '工位信息',
+          searchAllSchemas: Workstation.allSchemas,
+          searchPage: WorkstationApi.getWorkstationPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'productionLineCode',
+              value: 'productionLineCode',
+              message: '请填写生产线代码！',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '工序代码',
+      field: 'processCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
         enterSearch: true,
-        isSearchList: true,
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择工序代码',
         searchField: 'code',
         searchTitle: '工序信息',
         searchAllSchemas: Process.allSchemas,
         searchPage: ProcessApi.getProcessPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }, {
-          key: 'workshopCode',
-          value: 'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
+          {
+            key: 'workshopCode',
+            value: 'workshopCode',
+            message: '请填写车间代码！',
+            isMainValue: true
+          }
           // {
           //   key: 'productionLineCode',
           //   value: 'productionLineCode',
           //   message: '请填写生产线代码！',
           //   isMainValue: true
           // }
+        ],
+        isRepeat: true, //tableForm下方输入框是否可以重复添加该条数据
+        verificationParams: [
+          {
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择工序代码',
+          searchField: 'code',
+          searchTitle: '工序信息',
+          searchAllSchemas: Process.allSchemas,
+          searchPage: ProcessApi.getProcessPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'workshopCode',
+              value: 'workshopCode',
+              message: '请填写车间代码！',
+              isMainValue: true
+            }
+            // {
+            //   key: 'productionLineCode',
+            //   value: 'productionLineCode',
+            //   message: '请填写生产线代码！',
+            //   isMainValue: true
+            // }
           ],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTable:false,
-    isTableForm: false,
-    isForm: false
-  },
-  // {
-  //   label: '器具号',
-  //   field: 'containerNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   hiddenInMain:true,
-  //   isTable:false,
-  //   isTableForm: false,
-  //   isForm: false
-  // },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTable: false,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '订单号',
-    field: 'woNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '订单行',
-    field: 'woLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      },
-    },
-    isTable: false,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    hiddenInMain:true,
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
+    },
+    {
+      label: '包装号',
+      field: 'packingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTable: false,
+      isTableForm: false,
+      isForm: false
+    },
+    // {
+    //   label: '器具号',
+    //   field: 'containerNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain:true,
+    //   isTable:false,
+    //   isTableForm: false,
+    //   isForm: false
+    // },
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTable: false,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '订单号',
+      field: 'woNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '订单行',
+      field: 'woLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 1,
+          precision: 6
+        }
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      // dictType: DICT_TYPE.PACK_UNIT,
+      // dictClass: 'string',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '到货主代码',
+      field: 'toOwnerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      hiddenInMain: true,
+      isTableForm: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    sortTableDefault: 1003,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      // enterSearch:true,
-      disabled: true,
-      multiple: true,
-      isInpuFocusShow: false,
-      searchListPlaceholder: '请选择物料代码',
-      searchField: 'itemCode',
-      searchTitle: '生产线物料关系信息',
-      searchAllSchemas: Productionlineitem.allSchemas,
-      searchPage: ProductionlineitemApi.getProductionlineitemPage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }, {
-        key: 'productionLineCode',
-        value: 'productionLineCode',
-        message: '请填写生产线代码！',
-        isMainValue: true
-      }],
-
-      verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法
-      isShowTableFormSearch: true,
-      verificationParams: [{
-        key: 'itemCode',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+    },
+    {
+      label: '品番',
+      field: 'itemCode',
+      sort: 'custom',
+      sortTableDefault: 1003,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        // enterSearch:true,
+        disabled: true,
+        multiple: true,
+        isInpuFocusShow: false,
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '生产线物料关系信息',
         searchAllSchemas: Productionlineitem.allSchemas,
         searchPage: ProductionlineitemApi.getProductionlineitemPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }, {
-          key: 'productionLineCode',
-          value: 'productionLineCode',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        }],
-        verificationParams: [{
-          key: 'itemCode',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
+          {
+            key: 'productionLineCode',
+            value: 'productionLineCode',
+            message: '请填写生产线代码！',
+            isMainValue: true
+          }
+        ],
+
+        verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法
+        isShowTableFormSearch: true,
+        verificationParams: [
+          {
+            key: 'itemCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择品番',
+          searchField: 'itemCode',
+          searchTitle: '生产线物料关系信息',
+          searchAllSchemas: Productionlineitem.allSchemas,
+          searchPage: ProductionlineitemApi.getProductionlineitemPage,
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'productionLineCode',
+              value: 'productionLineCode',
+              message: '请填写生产线代码！',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'itemCode',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
       }
-    }
-  },
-  {
-    label: 'Bom版本',
-    field: 'bomVersion',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1004,
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
-      searchField: 'version', // 查询弹窗赋值字段
-      searchTitle: '物料清单信息', // 查询弹窗标题
-      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
-      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'productItemCode',
-        value:'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
+    },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isSearch: true,
+      sortTableDefault: 1003,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: 'Bom版本',
+      field: 'bomVersion',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1004,
+      tableForm: {
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
         searchField: 'version', // 查询弹窗赋值字段
         searchTitle: '物料清单信息', // 查询弹窗标题
         searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
         searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productItemCode',
-          value:'itemCode',
-          message: '请填写物料代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        searchCondition: [
+          {
+            key: 'productItemCode',
+            value: 'itemCode',
+            message: '请填写品番！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+          searchField: 'version', // 查询弹窗赋值字段
+          searchTitle: '物料清单信息', // 查询弹窗标题
+          searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+          searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'productItemCode',
+              value: 'itemCode',
+              message: '请填写品番！',
+              isMainValue: true
+            },
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      }
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      sortTableDefault: 1006,
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    sortTableDefault:1006,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sortTableDefault:1005,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    hiddenInMain:true,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    hiddenInMain:true,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    hiddenInMain:true,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    sortTableDefault:1006,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
+    {
+      label: '品名',
+      field: 'itemName',
+      sortTableDefault: 1005,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      hiddenInMain: true,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '描述',
+      field: 'itemDesc2',
+      hiddenInMain: true,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      hiddenInMain: true,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      sortTableDefault: 1006,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          max: 9999
+          // precision: 6
+        }
+      },
+      tableForm: {
+        type: 'InputNumber',
         min: 0,
-        max:9999,
+        max: 9999
         // precision: 6
-      },
+      }
     },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      max:9999,
-      // precision: 6
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    sortTableDefault:1007,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    }
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sortTableDefault:1008,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    tableForm: {
-      type: 'FormDate',
-      valueFormat: 'x',
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      sortTableDefault: 1007,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select',
+        disabled: true
       }
     },
-  },
-  {
-    label: '过期日期',
-    field: 'expireDate',
-    hiddenInMain:true,
-    isTable: false,
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    // tableForm: {
-    //   type: 'FormDate',
-    //   valueFormat: 'x',
-    // },
-    tableForm:{
-      type: 'slot',
-      disabled: true
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '生产日期',
+      field: 'produceDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sortTableDefault: 1008,
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      tableForm: {
+        type: 'FormDate',
+        valueFormat: 'x'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
       }
     },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    hiddenInMain:true,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sortTableDefault:1009,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '过期日期',
+      field: 'expireDate',
+      hiddenInMain: true,
+      isTable: false,
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      // tableForm: {
+      //   type: 'FormDate',
+      //   valueFormat: 'x',
+      // },
+      tableForm: {
+        type: 'slot',
+        disabled: true
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
       }
     },
-    isTableForm: false,
-    isForm: false,
-    isTable: true
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sortTableDefault:1010,
-    sort: 'custom',
-    isTable: true,
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    isTable: false,
-    hiddenInMain:true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      hiddenInMain: true,
+      table: {
+        width: 150
       }
     },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTable: false,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:false,
-  }
-]))
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sortTableDefault: 1009,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTableForm: false,
+      isForm: false,
+      isTable: true
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sortTableDefault: 1010,
+      sort: 'custom',
+      isTable: true,
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      isTable: false,
+      hiddenInMain: true,
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      isTable: false,
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '操作',
+      hiddenInMain: true,
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      },
+      isTableForm: false
+    }
+  ])
+)
 
 //表单校验
 export const ProductreceiptRequestDetailRules = reactive({
-  produceDate: [
-    { required: true, message: '请选择生产日期', trigger: 'change' }
-  ],
-  expireDate: [
-    { required: true, message: '请选择过期日期', trigger: 'change' }
-  ],
+  produceDate: [{ required: true, message: '请选择生产日期', trigger: 'change' }],
+  expireDate: [{ required: true, message: '请选择过期日期', trigger: 'change' }],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
-  ],
-  bomVersion: [
-    { required: true, message: '请选择Bom版本', trigger: 'change' }
-  ],
-  workStationCode: [
-    { required: true, message: '请选择工位代码', trigger: 'change' }
-  ],
-  uom: [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
-  ],
-  productionLineCode: [
-    { required: true, message: '请选择生产线代码', trigger: 'change' }
-  ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
+  bomVersion: [{ required: true, message: '请选择Bom版本', trigger: 'change' }],
+  workStationCode: [{ required: true, message: '请选择工位代码', trigger: 'change' }],
+  uom: [{ required: true, message: '请选择计量单位', trigger: 'change' }],
+  productionLineCode: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 制品收货申请子表
  */
-export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '工序代码',
-    field: 'processCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    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',
+export const BackflushRequestDetailb = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '工序代码',
+      field: 'processCode',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    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',
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      }
+    },
+    {
+      label: '品番',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      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'
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  }
-]))
+    {
+      label: '品名',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '描述',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '项目代码',
+      field: 'projectCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      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'
+        }
+      }
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    }
+  ])
+)
 
 //表单校验
 export const BackflushRequestDetailbRules = reactive({
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
-  ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
-  ],
-
+  number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
+  createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
+  creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
 
-
-
-
-
 /**
  * @returns {Array} 制品收货申请子表二子表
  */
-export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '工序代码',
-    field: 'processCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: 'BOM版本',
-    field: 'bomVersion',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: 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',
-    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
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180,
-      fixed: 'left'
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-]))
-
+export const BackflushDetailRequest = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '工序代码',
+      field: 'processCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: 'BOM版本',
+      field: 'bomVersion',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '品番',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '品名',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '描述',
+      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
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    }
+  ])
+)
 
 /**
  * @returns {Array} 号口品收货申请创建标签
  */
-export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
+export const ProductreceiptRequestLabel = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '品番',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
         disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-      type:'FormDate',
-      placeholder: '请选择从批次',
-      valueFormat: 'YYYYMMDD',
-      format: 'YYYYMMDD',
-    },
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true,
+        type: 'FormDate',
+        placeholder: '请选择从批次',
+        valueFormat: 'YYYYMMDD',
+        format: 'YYYYMMDD'
+      }
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
         disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select',
         disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 120
+      },
+      isTable: false,
+      isTableForm: true,
+      isForm: true,
+      tableForm: {
+        enterSearch: true,
+        isInpuFocusShow: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'packUnit', // 查询弹窗赋值字段
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
         searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },
           {
             key: 'itemCode',
             value: 'itemCode',
-            message: '请选择订单行',
+            message: '请先选择品番！',
             isMainValue: true
-          },
+          }
+        ],
+        verificationParams: [
           {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
+            key: 'packUnit',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
           }
-        ]
-
+        ] // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+          searchField: 'packUnit', // 查询弹窗赋值字段
+          searchTitle: '物料包装信息', // 查询弹窗标题
+          searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+          searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'itemCode',
+              value: 'itemCode',
+              message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'packUnit',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-    tableForm: {
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    },
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
+    {
+      label: '标签生产线代码',
+      field: 'productionLineCodePackage',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      tableForm: {
         disabled: true
       }
     },
-    tableForm: {
-      disabled: true,
-    }
-  },
-  {
-    label: '标签生产线代码',
-    field: 'productionLineCodePackage',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    tableForm: {
-      disabled: true,
-    },
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierItemCode',
-    sort: 'custom',
-    isTableForm: false,
-    isForm: false,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-      searchField: 'supplierCode', // 查询弹窗赋值字段
-      searchTitle: '供应商信息', // 查询弹窗标题
-      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
-      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      }]
-    }
-  },
+    {
+      label: '供应商代码',
+      field: 'supplierItemCode',
+      sort: 'custom',
+      isTableForm: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'supplierCode', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请填写品番！',
+            isMainValue: true
+          }
+        ]
+      }
+    },
 
-  {
-    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: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false
+    },
+    {
+      label: '描述',
+      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: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    isTableForm: false,
-    isForm: false,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      isTableForm: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select',
         disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    isTableForm: false,
-    isForm: false,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
+    },
+    {
+      label: '来源生产线代码',
+      field: 'productionLineCode',
+      sort: 'custom',
+      isTableForm: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      tableForm: {
         disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '来源工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-    isTableForm: false,
-    isForm: false,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
+    },
+    {
+      label: '来源工位代码',
+      field: 'workStationCode',
+      sort: 'custom',
+      isTableForm: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      tableForm: {
         disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '来源库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    isTableForm: false,
-    isForm: false,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
+    },
+    {
+      label: '来源库位代码',
+      field: 'fromLocationCode',
+      sort: 'custom',
+      isTableForm: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      tableForm: {
         disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
+    },
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTableForm: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
-    }
-  },
+    },
 
-  {
-    label: '包装规格2',
-    field: 'secondPackUnit',
-    sort: 'custom',
-    isTableForm: false,
-    isForm: false,
-    table: {
-      width: 150,
-      componentProps: {
+    {
+      label: '包装规格2',
+      field: 'secondPackUnit',
+      sort: 'custom',
+      isTableForm: false,
+      isForm: false,
+      table: {
+        width: 150,
+        componentProps: {
+          disabled: true,
+          isSearchList: true,
+          searchListPlaceholder: '请选择包装',
+          searchField: 'packUnit',
+          searchTitle: '物品包装信息',
+          searchAllSchemas: Itempackaging.allSchemas,
+          searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+          searchCondition: [
+            {
+              key: 'itemCode',
+              value: 'itemCode',
+              message: '请选择订单行',
+              isMainValue: true
+            },
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      tableForm: {
+        enterSearch: true,
         disabled: true,
-        isSearchList: true,
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择包装',
         searchField: 'packUnit',
         searchTitle: '物品包装信息',
@@ -2041,62 +2137,38 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
             isMainValue: false
           }
         ]
-
       }
     },
-    tableForm: {
-      enterSearch: true,
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
-  {
-    label: '包装数量2',
-    field: 'secondPackQty',
-    sort: 'custom',
-    isTableForm: false,
-    isForm: false,
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
+    {
+      label: '包装数量2',
+      field: 'secondPackQty',
+      sort: 'custom',
+      isTableForm: false,
+      isForm: false,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
         disabled: true
       }
-    },
-    tableForm: {
-      disabled: true,
     }
-  },
-]))
+  ])
+)
 
 //表单校验
 export const ProductreceiptRequestLabelRules = reactive({
-  supplierItemCode: [
-    { required: true, message: '请选择供应商', trigger: 'change' }
+  supplierItemCode: [{ required: true, message: '请选择供应商', trigger: 'change' }],
+  productionLineCodePackage: [{ required: true, message: '请选择生产线', trigger: 'change' }],
+  batch: [{ required: true, message: '请选择批次', trigger: ['change', 'blur'] }],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
   ],
-  productionLineCodePackage: [
-    { required: true, message: '请选择生产线', trigger: 'change' }
-  ],
-  batch: [
-    { required: true, message: '请选择批次', trigger: ['change', 'blur'] }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: ['change','blur'] }
   ],
 })
-
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
index c4d9e18d3..35c5183b5 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
@@ -25,7 +25,7 @@ export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
   },
   {
-    label: '成品物料代码',
+    label: '成品品番',
     field: 'finishedItemCode',
     sort: 'custom',
     isSearch: true,
@@ -148,7 +148,7 @@ export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '原料物料代码',
+    label: '原料品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -165,7 +165,7 @@ export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '原料物料名称',
+    label: '原料品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -173,7 +173,7 @@ export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '原料物料描述1',
+    label: '原料背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -181,7 +181,7 @@ export const RawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '原料物料描述2',
+    label: '原料描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
index d047bd058..30034ffe3 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
@@ -784,7 +784,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sortTableDefault:1000,
     sort: 'custom',
@@ -793,7 +793,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sortTableDefault:1001,
     sort: 'custom',
@@ -802,7 +802,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     isTable:false,
     hiddenInMain:true,
@@ -812,7 +812,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     isTable:false,
     hiddenInMain:true,
@@ -956,7 +956,7 @@ export const ProductreceiptJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
index f472d7177..ccbdaf238 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -320,7 +320,7 @@ const searchFormClick = (searchData) => {
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       masterId: row.id
     }
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
index b719a51d3..a3df2605f 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
@@ -434,7 +434,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -442,7 +442,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -450,7 +450,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -458,7 +458,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -793,7 +793,7 @@ export const ProductreceiptRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -883,7 +883,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -927,7 +927,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -935,7 +935,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -943,7 +943,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1030,7 +1030,7 @@ export const BackflushRecordDetailbRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 37a8db7c5..c124b1fa1 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -490,7 +490,7 @@ const buttonTableClick = async (val, row) => {
           })
           }
         } else {
-          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          message.warning('没有查询到品番：【' + item.itemCode + '】')
           return
         }
       })
@@ -750,7 +750,7 @@ const submitFormLabel = async (formType, submitData) => {
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       masterId: row.id
     }
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 143740125..9fd2b0458 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -962,7 +962,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -972,7 +972,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     tableForm:{
       enterSearch:true,
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码',
+      searchListPlaceholder: '请选择品番',
       searchField: 'itemCode',
       searchTitle: '生产线物料关系信息',
       searchAllSchemas: Productionlineitem.allSchemas,
@@ -1001,7 +1001,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '生产线物料关系信息',
         searchAllSchemas: Productionlineitem.allSchemas,
@@ -1045,7 +1045,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key:'productItemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -1065,7 +1065,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchCondition: [{
           key:'productItemCode',
           value:'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -1140,7 +1140,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1150,7 +1150,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1162,7 +1162,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1388,7 +1388,7 @@ export const ProductreceiptRequestDetailRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   bomVersion: [
     { required: true, message: '请选择Bom版本', trigger: 'change' }
@@ -1428,7 +1428,7 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1472,7 +1472,7 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1480,7 +1480,7 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1488,7 +1488,7 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1561,7 +1561,7 @@ export const BackflushRequestDetailbRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -1601,7 +1601,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1611,7 +1611,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1621,7 +1621,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1631,7 +1631,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1788,13 +1788,13 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       searchCondition:[{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       }]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1810,7 +1810,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1820,7 +1820,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1830,7 +1830,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
index e44e29c50..dc45f95ee 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index b6ea3c386..6cd35701a 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -490,7 +490,7 @@ export const ProductredressJobDetailRules = reactive({
 export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
 
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -498,13 +498,32 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch:true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '批次',
     field: 'batch',
@@ -627,7 +646,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   // },
 
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -637,7 +656,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
index 1964bdc01..8e3c3e7aa 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index 6dd691ca4..c022f1914 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -374,7 +374,7 @@ export const ProductredressRecordDetailRules = reactive({
 
 export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -382,13 +382,32 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch:true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '批次',
     field: 'batch',
@@ -490,7 +509,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
 
 
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -500,7 +519,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain: true
   },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index ebe38e028..7e5b8752e 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -177,9 +177,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         //车间代码
         setV['productionLineCode'] = ''
         setV['workStationCode'] = ''
+        tableData.value = []
       }else if('productionLineCode'==formField){
         //生产线
         setV['workStationCode'] = ''
+        tableData.value = []
       }
       formRef.setValues(setV)
     }
@@ -541,7 +543,7 @@ const searchFormClick = (searchData) => {
 // const tableFormButton = async (val , row) => {
 //   if (val == 'bom') { // 查看 bom
 //     bomModelVisible.value = true
-//     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+//     DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
 //     detatableDataBom.params = {
 //       masterId: row.masterId
 //     }
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 04f368239..a90d50f9f 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -522,7 +522,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   // },
 
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -532,7 +532,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       // labelMessage: '信息提示说明！！！',
       // componentProps: {
       //   isSearchList: true, // 开启查询弹窗
-      //   searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      //   searchListPlaceholder: '请选择品番', // 输入框占位文本
       //   searchField: 'itemCode', // 查询弹窗赋值字段
       //   searchTitle: '库存余额信息', // 查询弹窗标题
       //   searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
@@ -556,7 +556,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true,
       multiple:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -591,7 +591,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         isFormModel:true, // filters中添加筛选的数据--取于formModel
         required:true, // 前置添加必有，和isFormModel结合使用
         message: '请选择生产线代码！', // 前置添加没填的提示语
-        isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+        isOptional:false, // isMainValue=true情况，添加参数可选可空的判断
 
       }
 
@@ -599,7 +599,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物品名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -609,18 +609,36 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
   },
   {
-    label: '物品描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },
     isForm: false,
-    isTableForm: false,
-    hiddenInMain:true,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  //   isTableForm: false,
+  //   hiddenInMain:true,
+  // },
   {
-    label: '物品描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
index 24d2d73ff..3fd3b48a5 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
@@ -135,11 +135,11 @@ const { getList:getDetailListBom } = detatableMethodsBom
 // 新增 tableform 按钮
 const buttonOperationClick = async (row, label, index)=> {
   if (row.itemCode == '') {
-    message.warning('请选择物料代码！')
+    message.warning('请选择品番！')
     return
   }
   detatableDataBom.params.itemCode = row.itemCode
-  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
+  DialogTitle.value = '品番:【' + row.itemCode + '】 Bom 信息'
   bomModelVisible.value = true
   await getDetailListBom()
   detatableDataBom.tableList.map(item => {
@@ -183,7 +183,7 @@ const buttonBaseClickBom = (val) => {
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       masterId: row.masterId
     }
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index 7e3d1b89a..0855c324e 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -548,7 +548,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -596,7 +596,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -605,7 +605,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:9,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -614,7 +614,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -711,7 +711,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchCondition: [{
         key:'productItemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -732,7 +732,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key:'productItemCode',
           value:'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -793,7 +793,7 @@ export const ProductrepairRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -820,7 +820,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     tableForm:{
       disabled: true
@@ -906,7 +906,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -917,7 +917,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -928,7 +928,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 14c93554f..4e61adc59 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -206,12 +206,12 @@ const buttonBaseClickBom = (val) => {
 // 新增 tableform 按钮
 const buttonOperationClick = async (row, label, index)=> {
   if (row.itemCode == '') {
-    message.warning('请选择物料代码！')
+    message.warning('请选择品番！')
     return
   }
   detatableDataBom.params.itemCode = row.itemCode
   detatableDataBom.params.bomVersion = row.bomVersion
-  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
+  DialogTitle.value = '品番:【' + row.itemCode + '】 Bom 信息'
   detailQty.value = row.qty
   bomModelVisible.value = true
   await getDetailListBom()
@@ -710,7 +710,7 @@ const searchFormClick = (searchData) => {
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
        itemCode: row.itemCode,
        bomVersion: row.bomVersion,
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 3f2df69bb..036053ccb 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -731,7 +731,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -922,7 +922,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -933,7 +933,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -945,7 +945,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1060,7 +1060,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key:'productItemCode',
         value:'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
         isMainValue: true
       },{
         key: 'available',
@@ -1080,7 +1080,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
         searchCondition: [{
           key:'productItemCode',
           value:'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
         },{
           key: 'available',
@@ -1127,7 +1127,7 @@ export const ProductrepairRequestDetailaRules = reactive({
     { required: true, message: '请输入库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   bomVersion: [
     { required: true, message: '请选择Bom版本', trigger: 'change' }
@@ -1185,7 +1185,7 @@ export const ConsumereRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1229,7 +1229,7 @@ export const ConsumereRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1237,7 +1237,7 @@ export const ConsumereRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1245,7 +1245,7 @@ export const ConsumereRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1341,7 +1341,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     tableForm:{
       disabled: true
@@ -1443,7 +1443,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1454,7 +1454,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1465,7 +1465,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
index 5b93fbace..491789dbb 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
@@ -670,7 +670,7 @@ export const ProductscrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -678,7 +678,7 @@ export const ProductscrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -686,7 +686,7 @@ export const ProductscrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -694,7 +694,7 @@ export const ProductscrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -795,7 +795,7 @@ export const ProductscrapJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
index e309491dd..7d967a37a 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
@@ -157,12 +157,12 @@ const { getList:getDetailListBom } = detatableMethodsBom
 // 新增 tableform 按钮
 const buttonOperationClick = async (row, label, index)=> {
   if (row.itemCode == '') {
-    message.warning('请选择物料代码！')
+    message.warning('请选择品番！')
     return
   }
   detatableDataBom.params.itemCode = row.itemCode
   detatableDataBom.params.masterId = row.id
-  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
+  DialogTitle.value = '品番:【' + row.itemCode + '】 Bom 信息'
   bomModelVisible.value = true
   await getDetailListBom()
   detatableDataBom.tableList.map(item => {
@@ -205,7 +205,7 @@ const buttonBaseClickBom = (val) => {
 const tableFormButton = async (val , row) => {
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    DialogTitle.value = '品番【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       masterId: row.masterId,
       itemCode: row.itemCodeThird
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 11b35d13f..f2e469f7b 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -546,7 +546,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '制品物料代码',
+    label: '制品品番',
     field: 'itemCode',
     isSearch:true,
     sort: 'custom',
@@ -555,7 +555,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '制品物料名称',
+    label: '制品品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -602,7 +602,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '原料物料代码',
+    label: '原料品番',
     field: 'itemCodeThird',
     sort: 'custom',
     isSearch:true,
@@ -612,7 +612,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '原料物料名称',
+    label: '原料品名',
     field: 'itemNameThird',
     sort: 'custom',
     isTable: true,
@@ -793,7 +793,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -802,7 +802,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -889,7 +889,7 @@ export const ProductscrapRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -916,7 +916,7 @@ export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     tableForm:{
       disabled: true
@@ -1002,7 +1002,7 @@ export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive<CrudSchema
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1013,7 +1013,7 @@ export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1024,7 +1024,7 @@ export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index f9ea06520..f21e8fa5a 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -110,8 +110,8 @@
   >
   <template #TableFormHead>
     <el-form inline>
-      <el-form-item label="物料代码">
-        <el-input v-model="bomSearchData" @input="bomSearchData = bomSearchData.replace(/，/g, ',')" clearable placeholder="请输入物料代码"/>
+      <el-form-item label="品番">
+        <el-input v-model="bomSearchData" @input="bomSearchData = bomSearchData.replace(/，/g, ',')" clearable placeholder="请输入品番"/>
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="bomSearchClick"><Icon class="mr-5px" icon="ep:search" />{{ t('common.query') }}</el-button>
@@ -313,7 +313,7 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> {
   console.log('buttonOperationClick',row, label, index)
   if (row.itemCode == '') {
     if(!isSave){
-      message.warning('请选择物料代码！')
+      message.warning('请选择品番！')
     }
     return
   }
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 006d37068..d665b9a31 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -723,7 +723,7 @@ export const ProductscrapRequestMainRules = reactive({
  */
 export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -734,7 +734,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '生产线物料关系信息', // 查询弹窗标题
         searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -770,7 +770,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       multiple: true,
       enterSearch:true,
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -819,7 +819,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // searchCondition: [{
       //   key:'productItemCode',
       //   value:'itemCode',
-      //   message: '请填写物料代码！',
+      //   message: '请填写品番！',
       //   isMainValue: true
       // },{
       //   key: 'available',
@@ -839,7 +839,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         // searchCondition: [{
         //   key:'productItemCode',
         //   value:'itemCode',
-        //   message: '请填写物料代码！',
+        //   message: '请填写品番！',
         //   isMainValue: true
         // },{
         //   key: 'available',
@@ -927,7 +927,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // {
       //   key: 'itemCode',
       //   value: 'itemCode',
-      //   message: '请选择物料代码',
+      //   message: '请选择品番',
       //   isTableRowValue: true, //查询当前searchTable表中行数据的值
       //   isMainValue:false
       // }
@@ -971,7 +971,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         // {
         //   key: 'itemCode',
         //   value: 'itemCode',
-        //   message: '请选择物料代码',
+        //   message: '请选择品番',
         //   isTableRowValue: true, //查询当前searchTable表中行数据的值
         //   isMainValue:false
         // }
@@ -1075,7 +1075,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1228,7 +1228,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1239,7 +1239,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1403,7 +1403,7 @@ export const ProductscrapRequestDetailRules = reactive({
   //   { required: true, message: '请选择工序代码', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   bomVersion: [
     { required: true, message: '请选择Bom版本', trigger: 'change' }
@@ -1430,7 +1430,7 @@ export const ProdcutscrapBomScrap = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     tableForm:{
       disabled: true
@@ -1540,7 +1540,7 @@ export const ProdcutscrapBomScrap = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1551,7 +1551,7 @@ export const ProdcutscrapBomScrap = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1562,7 +1562,7 @@ export const ProdcutscrapBomScrap = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue
index b2aab24a8..02d14668c 100644
--- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 30bd3f3e8..61c589ac3 100644
--- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 300,
       fixed: 'right'
     },
   },
@@ -411,15 +411,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:12,
   },
-  {
-    label: '发货数量',
-    field: 'shippedQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:12,
-  },
+  // {
+  //   label: '发货数量',
+  //   field: 'shippedQty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:12,
+  // },
   {
     label: '收货数量',
     field: 'qty',
@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,17 +669,29 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:11,
-    hiddenInMain:true
+    sortTableDefault: 10,
+    isTableForm: false,
+    isSearch: true,
+    isForm: false
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:11,
+  //   hiddenInMain:true
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -832,7 +844,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
@@ -1287,7 +1299,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1303,7 +1315,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1319,7 +1331,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1335,7 +1347,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue
index c1c43e19e..67142dc7f 100644
--- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index fc56577e1..8d024c6a0 100644
--- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 300,
       fixed: 'right'
     },
   },
@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,17 +669,19 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:11,
-    hiddenInMain:true
+    sortTableDefault: 10,
+    isTableForm: false,
+    isSearch: true,
+    isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -832,7 +834,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
@@ -1287,7 +1289,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1303,7 +1305,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1319,7 +1321,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1335,7 +1337,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue
index f6d897888..cd6f163c1 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
index adf7e94ef..25cb32f64 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -913,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
 
     {
-      label: '供应商计量数量',
+      label: '供应商发货数量',
       field: 'supplierQty',
       sort: 'custom',
       table: {
@@ -972,7 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 1008
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -990,6 +990,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       },
       sortTableDefault: 7
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 7,
+      isTableForm: false,
+      isSearch: true,
+      isForm: false
+    },
     {
       label: '物料类型',
       field: 'itemType',
@@ -1008,7 +1020,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       }
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -1018,7 +1030,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 7
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -1163,7 +1175,7 @@ export const PurchasereceiptJobDetailRules = reactive({
   convertRate: [{ required: true, message: '请输入转换率', trigger: 'blur' }],
   toLocationCode: [{ required: true, message: '请选择到库位代码', trigger: 'change' }],
   number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
-  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
   createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
   creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
@@ -1464,7 +1476,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -1475,7 +1487,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -1486,7 +1498,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -1497,7 +1509,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue
index 12348f8a5..a66724573 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue
@@ -43,7 +43,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index bab1d6b8f..71e3db644 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 300,
       fixed: 'right'
     },
   },
@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,7 +669,19 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 10,
+    isTableForm: false,
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -679,7 +691,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain:true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -834,7 +846,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
@@ -1289,7 +1301,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1305,7 +1317,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1321,7 +1333,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1337,7 +1349,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
index adb90a59b..73bf797fe 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -132,7 +132,7 @@
     <template #searchQuery>
       <el-form :inline="true">
         <el-form-item>
-          <el-input v-model="printItemCode" placeholder="请输入物料代码"></el-input>
+          <el-input v-model="printItemCode" placeholder="请输入品番"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="searchPrint">
@@ -580,14 +580,18 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-let array = []//存储可采购数据
+  let array = []//存储可采购数据
+  let arrayTool = []//存储可采购协定品数据
   let array1 = []//存储可制造数据
-    let packingNumbers = []
+  let packingNumbers = []
   val.forEach((item,index) => {
     packingNumbers.push(item.number)
-   
     if (item.itemType == '可采购') {
-      array.push(item)
+      if (item.itemBasicType =='TOOL') {
+        arrayTool.push(item)
+      } else {
+        array.push(item)
+      }
     }
     if (item.itemType == '可制造') {
       array1.push(item)
@@ -602,6 +606,16 @@ let array = []//存储可采购数据
       message.error('创建标签失败')
     })
   }
+  // 打印协定品采购件
+  if (arrayTool.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:arrayTool.map(item1=>item1.number)}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+  }
   if (array1.length > 0) {
     await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
       console.log(res)
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 7f826010e..be7655c46 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -574,7 +574,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -766,7 +766,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -776,6 +776,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 7,
+    isTableForm: false,
+    isSearch: true,
+    isForm: false
+  },
   {
     label: '物料类型',
     field: 'itemType',
@@ -797,7 +809,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
 
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -809,7 +821,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1098,7 +1110,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {
@@ -1411,7 +1423,7 @@ export const PurchasereceiptRequestDetailRules = reactive({
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
 })
 
@@ -1520,7 +1532,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1536,7 +1548,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1546,7 +1558,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1556,7 +1568,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -2095,7 +2107,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -2111,7 +2123,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -2123,7 +2135,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -2135,7 +2147,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
index 848a37dc4..03f9d704e 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
@@ -314,7 +314,7 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -755,7 +755,7 @@ export const InspectJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -763,7 +763,7 @@ export const InspectJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -771,7 +771,7 @@ export const InspectJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -779,7 +779,7 @@ export const InspectJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -833,7 +833,7 @@ export const InspectJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
index 632ec6e49..e44f8463c 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
@@ -344,7 +344,7 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -493,7 +493,7 @@ export const InspectRecordMainRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   businessType: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -681,7 +681,7 @@ export const InspectRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -725,7 +725,7 @@ export const InspectRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -733,7 +733,7 @@ export const InspectRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -741,7 +741,7 @@ export const InspectRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -843,7 +843,7 @@ export const InspectRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index 1625e6e26..b7c227b8e 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -83,7 +83,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
-      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+      labelMessage: '影响明细中品番，需在供应商物料中维护',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
@@ -601,7 +601,7 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -618,7 +618,7 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -628,7 +628,7 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -638,7 +638,7 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -698,6 +698,6 @@ export const InspectRequestDetailRules = reactive({
     { required: true, message: '请输入库位代码', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
 })
diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue
index e6dd1d9cd..b50ef114d 100644
--- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 30bd3f3e8..8061f3f63 100644
--- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 300,
       fixed: 'right'
     },
   },
@@ -411,15 +411,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:12,
   },
-  {
-    label: '发货数量',
-    field: 'shippedQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:12,
-  },
+  // {
+  //   label: '发货数量',
+  //   field: 'shippedQty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:12,
+  // },
   {
     label: '收货数量',
     field: 'qty',
@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,17 +669,19 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:11,
-    hiddenInMain:true
+    sortTableDefault: 10,
+    isTableForm: false,
+    isSearch: true,
+    isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -832,7 +834,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
@@ -1287,7 +1289,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1303,7 +1305,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1319,7 +1321,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1335,7 +1337,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue
index 140d0a30d..21cf0436d 100644
--- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -132,7 +132,7 @@
     <template #searchQuery>
       <el-form :inline="true">
         <el-form-item>
-          <el-input v-model="printItemCode" placeholder="请输入物料代码"></el-input>
+          <el-input v-model="printItemCode" placeholder="请输入品番"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="searchPrint">
diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 7f826010e..466467f6d 100644
--- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -574,7 +574,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -766,7 +766,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -776,6 +776,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 7,
+    isSearch: true,
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '物料类型',
     field: 'itemType',
@@ -797,7 +809,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
 
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -809,7 +821,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1098,7 +1110,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {
@@ -1411,7 +1423,7 @@ export const PurchasereceiptRequestDetailRules = reactive({
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
 })
 
@@ -1520,7 +1532,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1536,7 +1548,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1546,7 +1558,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1556,7 +1568,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -2095,7 +2107,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -2111,7 +2123,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -2123,7 +2135,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -2135,7 +2147,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue
index b3c3c1724..51cc1081a 100644
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts
index d26cfcc86..47580e0be 100644
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts
@@ -1,4 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
 
 export const PurchaseBarterRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -42,12 +43,90 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'supplierName',
     sort: 'custom',
     isSearch: false,
-  }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x'
+      }
+    },
+    isSearch: true,
+    isTable: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    sortTableDefault: 1000,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true,
+    sortTableDefault: 1000,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x'
+      }
+    },
+    sortTableDefault: 1000,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    sortTableDefault: 1000,
+  },
 ]))
 
 export const PurchaseBarterRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -56,11 +135,27 @@ export const PurchaseBarterRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isSearch: false,
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue
index c470ac062..b38e59460 100644
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -253,16 +253,16 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3']),hasPermi:'wms:purchase-barter-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','8']),hasPermi:'wms:purchase-barter-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:purchase-barter-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-barter-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchase-barter-request-main:refused'}), // 驳回
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchase-barter-request-main:agree'}), // 审批通过
-        defaultButtons.outBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchase-barter-request-main:out'}), // 出库
-        defaultButtons.inBtn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:in'}), // 入库
-        defaultButtons.mainListSuspend1Btn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:suspend'}), // 中止
+        // defaultButtons.outBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchase-barter-request-main:out'}), // 出库
+        // defaultButtons.inBtn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:in'}), // 入库
+        // defaultButtons.mainListSuspend1Btn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:suspend'}), // 中止
         defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-barter-request-main:delete'}), // 删除
-        defaultButtons.mainListDocumentPrintBtn({hide:isShowMainButton(row,['1','2','3','4','6','7','8','11'])})
+        defaultButtons.mainListDocumentPrintBtn({hide:isShowMainButton(row,['8'])})
     ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
index 209aae855..6ef8c293d 100644
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
@@ -2,6 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import {Supplier} from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
 import * as SupplierApi from "@/api/wms/supplier";
 import * as ItembasicApi from "@/api/wms/itembasic";
+import { dateFormatter } from '@/utils/formatTime'
 import {
   Supplieritem
 } from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
@@ -74,6 +75,81 @@ export const PurchaseBarterRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x'
+      }
+    },
+    isSearch: true,
+    
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    sortTableDefault: 1000,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    sortTableDefault: 1000,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x'
+      }
+    },
+    sortTableDefault: 1000,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    table: {
+      width: 150
+    },
+    sortTableDefault:1000,
+  },
   {
     label: '操作',
     field: 'action',
@@ -98,7 +174,7 @@ export const PurchaseBarterRequestMainRules = reactive({
  */
 export const PurchaseBarterRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -108,7 +184,7 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     tableForm:{
       multiple:true,//多选
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',// 输入框占位文本
+      searchListPlaceholder: '请选择品番',// 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas,
@@ -140,7 +216,7 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled:true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: BalancePopWindow.allSchemas,
@@ -169,7 +245,7 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isSearch: false,
@@ -182,6 +258,43 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   isSearch: true,
+  //   // sortTableDefault: 8,
+  //   // sortSearchDefault: 5,
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '计量单位',
     field: 'uom',
@@ -298,6 +411,6 @@ export const PurchaseBarterRequestDetailRules = reactive({
     { validator:validateQty, message: '换货数量必须是一个正数', trigger: 'change'}
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
 })
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 62ff3af95..9429f85e2 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index adf7e94ef..e0f283846 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -913,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
 
     {
-      label: '供应商计量数量',
+      label: '供应商发货数量',
       field: 'supplierQty',
       sort: 'custom',
       table: {
@@ -972,7 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 1008
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -990,6 +990,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       },
       sortTableDefault: 7
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 7,
+      isTableForm: false,
+      isForm: false,
+      isSearch: true,
+    },
     {
       label: '物料类型',
       field: 'itemType',
@@ -1007,18 +1019,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
         }
       }
     },
+    // {
+    //   label: '背番',
+    //   field: 'itemDesc1',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenInMain: true,
+    //   sortTableDefault: 7
+    // },
     {
-      label: '物料描述1',
-      field: 'itemDesc1',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      hiddenInMain: true,
-      sortTableDefault: 7
-    },
-    {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -1163,7 +1175,7 @@ export const PurchasereceiptJobDetailRules = reactive({
   convertRate: [{ required: true, message: '请输入转换率', trigger: 'blur' }],
   toLocationCode: [{ required: true, message: '请选择到库位代码', trigger: 'change' }],
   number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
-  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
   createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
   creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
@@ -1464,7 +1476,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -1475,7 +1487,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -1486,7 +1498,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -1497,7 +1509,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts
index 4ba2f839b..c0146d06c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts
@@ -649,7 +649,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -713,7 +713,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
 
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -722,7 +722,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -732,7 +732,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain:true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1350,7 +1350,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1366,7 +1366,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1382,7 +1382,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1398,7 +1398,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index 44b2ca51a..0a0844360 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -43,7 +43,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 1bf964235..8623e72e8 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 300,
       fixed: 'right'
     },
   },
@@ -613,16 +613,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true
     },
   },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:10,
-    isSearch: true
-  },
+ 
   {
     label: '是否已发送检验申请',
     field: 'inspectRequestFlag',
@@ -660,7 +651,17 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 10,
+    isSearch: true
+  },
+  {
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,17 +670,29 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:11,
-    hiddenInMain:true
+    sortTableDefault: 10,
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:11,
+  //   hiddenInMain:true
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -834,7 +847,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
@@ -1289,7 +1302,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1305,7 +1318,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1321,7 +1334,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1337,7 +1350,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
index e5b387127..80985b59f 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
@@ -666,7 +666,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -676,7 +676,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isSearch: true
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -685,7 +685,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -695,7 +695,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain:true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1312,7 +1312,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1328,7 +1328,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1344,7 +1344,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1360,7 +1360,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue
index 61b9e431b..704166d44 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue
@@ -55,7 +55,7 @@ const getAnnexList = async () => {
     reportAnnex.annexList =  res.fileList
     let tableColumns = [
     {
-        "label": "物料代码",
+        "label": "品番",
         "field": "itemCode",
         "sort": "custom",
         "isForm": false,
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index b8829a5e9..cb4cb08c3 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -132,7 +132,7 @@
     <template #searchQuery>
       <el-form :inline="true">
         <el-form-item>
-          <el-input v-model="printItemCode" placeholder="请输入物料代码"></el-input>
+          <el-input v-model="printItemCode" placeholder="请输入品番"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="searchPrint">
@@ -582,35 +582,58 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
   let array = []//存储可采购数据
+  let arrayTool = []//存储可采购协定品数据
   let array1 = []//存储可制造数据
     let packingNumbers = []
-  val.forEach((item,index) => {
+    val.forEach((item,index) => {
     packingNumbers.push(item.number)
    
     if (item.itemType == '可采购') {
-      array.push(item)
+      if (item.itemBasicType =='TOOL') {
+        arrayTool.push(item)
+      } else {
+        array.push(item)
+      }
     }
     if (item.itemType == '可制造') {
       array1.push(item)
     }
   })
-  if (array.length>0) {
-    await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
-      console.log(res)
-      window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
-    }).catch(err => {
-      console.log(err)
-      message.error('创建标签失败')
-    })
-  }
-  if (array1.length > 0) {
-    await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
-      console.log(res)
-      window.open(src.value + '&asn_number=' + res)
-    }).catch(err => {
-      console.log(err)
-      message.error('创建标签失败')
-    })
+  console.log( searchTableRef.value)
+  tableObject.loading = true
+  try {
+    if (array.length>0) {
+      await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
+        console.log(res)
+        window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
+      }).catch(err => {
+        console.log(err)
+        message.error('创建标签失败')
+        tableObject.loading = false
+      })
+    }
+    // 打印协定品采购件
+    if (arrayTool.length>0) {
+      await PackageApi.getPrintingLableId({packingNumbers:arrayTool.map(item1=>item1.number)}).then(res => {
+        console.log(res)
+        window.open(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()+'&id=' + res)
+      }).catch(err => {
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    }
+    if (array1.length > 0) {
+      await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
+        console.log(res)
+        window.open(src.value + '&asn_number=' + res)
+      }).catch(err => {
+        console.log(err)
+        message.error('创建标签失败')
+        tableObject.loading = false
+      })
+    }
+  } finally {
+    tableObject.loading = false
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index d46203baa..87a2584a3 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -575,7 +575,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -749,7 +749,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -767,7 +767,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -777,6 +777,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 7,
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+  },
   {
     label: '物料类型',
     field: 'itemType',
@@ -797,20 +809,20 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
 
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:7,
+  //   hiddenInMain:true,
+  //   isTableForm: false,
+  //   isForm: false
+  // },
   {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:7,
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1099,7 +1111,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {
@@ -1412,7 +1424,7 @@ export const PurchasereceiptRequestDetailRules = reactive({
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
 })
 
@@ -1521,7 +1533,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1537,7 +1549,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1547,7 +1559,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1557,7 +1569,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -2096,7 +2108,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -2112,7 +2124,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -2124,7 +2136,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -2136,7 +2148,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -2558,7 +2570,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
 export const PurchasereceiptRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
   
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -2568,6 +2580,17 @@ export const PurchasereceiptRequestPackage = useCrudSchemas(reactive<CrudSchema[
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '批次',
     field: 'batch',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
index f5554a844..380939ba6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
@@ -752,7 +752,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -770,7 +770,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -781,7 +781,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -793,7 +793,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1377,7 +1377,7 @@ export const PurchasereceiptRequestDetailRules = reactive({
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
   qty:[
     { validator:validateQty, message: '收货数量必须大于0', trigger: 'change'}
@@ -1489,7 +1489,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1505,7 +1505,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1515,7 +1515,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1525,7 +1525,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -2064,7 +2064,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -2080,7 +2080,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -2092,7 +2092,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -2104,7 +2104,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index eb6f0d841..55a205daa 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
index af7e7444e..c8f1d51a8 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -653,7 +653,7 @@ export const PurchasereturnJobMain = useCrudSchemas(
       isDetail: false,
       isForm: false,
       table: {
-        width: 120,
+        width: 200,
         fixed: 'right'
       }
     }
@@ -856,7 +856,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault: 6,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -867,7 +867,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortSearchDefault: 5
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -876,17 +876,38 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault: 7,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
     sortTableDefault: 8,
+    sortSearchDefault: 5,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   sortTableDefault: 8,
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1078,7 +1099,7 @@ export const PurchasereturnJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts
index ed6c01452..544849d68 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts
@@ -754,7 +754,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
   },
 
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -764,7 +764,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
     sortSearchDefault: 6,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isTable:false,
@@ -774,7 +774,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
     sortSearchDefault: 6,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -784,7 +784,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index 10e18ee6e..0e0bae18f 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -34,7 +34,10 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index f50117219..8b3bce991 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -746,7 +746,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
 
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -756,7 +756,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortSearchDefault: 6,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -765,17 +765,37 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortSearchDefault: 6,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortSearchDefault: 7,
-    hiddenInMain: true
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+    sortSearchDefault: 6,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortSearchDefault: 7,
+  //   hiddenInMain: true
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue
index 7bf47d7e8..ace47379d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue
@@ -826,7 +826,7 @@ const onChangeForm = async (field, cur, formRef)=>{
   if(field=='supplierCode'){
     //供应商
     PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
-      // 物料名称赋值
+      // 品名赋值
       if(item.field=='supplierCode'){
         let setV = {}
         setV['supplierName'] =  item.componentProps.options?.find(el=>el.supplierCode==cur+'')['supplierName']
@@ -888,7 +888,7 @@ const getPurchanseList = async ()=>{
 const choosePurchanseList  = ()=>{
   
   if(!formRef.value.formRef.formModel.itemCode){
-    message.error('请选择物料代码')
+    message.error('请选择品番')
     return
   }
   if(!formRef.value.formRef.formModel.supplierCode){
@@ -916,7 +916,7 @@ const choosePurchanseList  = ()=>{
 // 选择收货单明细
 const chooseReceiptList = ()=>{
   if(!formRef.value.formRef.formModel.itemCode){
-    message.error('请选择物料代码')
+    message.error('请选择品番')
     return
   }
   if(!formRef.value.formRef.formModel.supplierCode){
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts
index aa8b29ec4..9778450d5 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts
@@ -227,7 +227,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -567,7 +567,7 @@ export const PurchasereceiptRequestDetailRules = reactive({
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
 })
 
@@ -676,7 +676,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -692,7 +692,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -702,7 +702,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -712,7 +712,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1251,7 +1251,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1267,7 +1267,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1279,7 +1279,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1291,7 +1291,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMain.data.ts
index 69d19a302..a6f70c89f 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMain.data.ts
@@ -41,7 +41,7 @@ const userDeptArray: any = [userDept]
 export const PurchasereceiptRecordMain1 = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       fixed: 'left',
       sort: 'custom',
@@ -90,7 +90,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(
     },
 
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -806,7 +806,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -847,7 +847,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -864,7 +864,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -884,7 +884,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1133,7 +1133,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchCondition: [{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请填写物料代码',
+          message: '请填写品番',
           isTableRowValue: true, //查询当前searchTable表中行数据的值
           required:true,
           isMainValue:true
@@ -1162,7 +1162,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       multiple: true,
       // labelMessage: '信息提示说明！！！',
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码、批次、从库位代码',
+      searchListPlaceholder: '请选择品番、批次、从库位代码',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -1170,7 +1170,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码',
+        message: '请填写品番',
         isTableRowValue: true, //查询当前searchTable表中行数据的值
         required:true,
         isMainValue:false
@@ -1624,7 +1624,7 @@ export const PurchasereturnRequestDetailRules = reactive({
   //   { required: true, message: '请选择原因', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -1633,7 +1633,7 @@ export const PurchasereturnRequestDetailRules = reactive({
 
 export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1649,7 +1649,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1661,7 +1661,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1673,7 +1673,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMainNew.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMainNew.data.ts
index c681f4d4e..6fed88b78 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMainNew.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMainNew.data.ts
@@ -49,7 +49,7 @@ const userDeptArray: any = [userDept]
 export const PurchasereturnRequestMainNew = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       isSearch: true,
@@ -61,7 +61,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
         componentProps: {
           enterSearch:true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -85,7 +85,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 02e56721a..31d3ca616 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 8725a4661..172247e90 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -41,7 +41,7 @@ const userDeptArray: any = [userDept]
 export const PurchasereceiptRecordMain1 = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       fixed: 'left',
       sort: 'custom',
@@ -89,7 +89,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(
     },
 
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -806,7 +806,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -847,7 +847,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -863,27 +863,27 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm:false,
-    isTable:false,
-    hiddenInMain: true,
+    sortTableDefault: 7,
+    isTableForm: false,
     isForm: false,
-    tableForm:{
-      disabled:true
+    isSearch: true,
+    tableForm: {
+      disabled: true
     },
     form: {
-      componentProps:{
-        disabled:true
+      componentProps: {
+        disabled: true
       }
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1132,7 +1132,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchCondition: [{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请填写物料代码',
+          message: '请填写品番',
           isTableRowValue: true, //查询当前searchTable表中行数据的值
           required:true,
           isMainValue:true
@@ -1161,7 +1161,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       multiple: true,
       // labelMessage: '信息提示说明！！！',
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码、批次、从库位代码',
+      searchListPlaceholder: '请选择品番、批次、从库位代码',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -1169,7 +1169,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码',
+        message: '请填写品番',
         isTableRowValue: true, //查询当前searchTable表中行数据的值
         required:true,
         isMainValue:false
@@ -1594,7 +1594,7 @@ export const PurchasereturnRequestDetailRules = reactive({
   //   { required: true, message: '请选择原因', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -1603,7 +1603,7 @@ export const PurchasereturnRequestDetailRules = reactive({
 
 export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1619,7 +1619,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1631,19 +1631,18 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      disabled:true
-    },
-    isTableForm: true,
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 8ce35bf16..06d73494e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -858,7 +858,7 @@ const onChangeForm = async (field, cur, formRef)=>{
   if(field=='supplierCode'){
     //供应商
     PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
-      // 物料名称赋值
+      // 品名赋值
       if(item.field=='supplierCode'){
         let setV = {}
         setV['supplierName'] =  item.componentProps.options?.find(el=>el.supplierCode==cur+'')['supplierName']
@@ -920,7 +920,7 @@ const getPurchanseList = async ()=>{
 const choosePurchanseList  = ()=>{
   
   if(!formRef.value.formRef.formModel.itemCode){
-    message.error('请选择物料代码')
+    message.error('请选择品番')
     return
   }
   if(!formRef.value.formRef.formModel.supplierCode){
@@ -948,7 +948,7 @@ const choosePurchanseList  = ()=>{
 // 选择收货单明细
 const chooseReceiptList = ()=>{
   if(!formRef.value.formRef.formModel.itemCode){
-    message.error('请选择物料代码')
+    message.error('请选择品番')
     return
   }
   if(!formRef.value.formRef.formModel.supplierCode){
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
index 900752cc3..65389964b 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
@@ -41,7 +41,7 @@ const userDeptArray: any = [userDept]
 export const PurchasereceiptRecordMain1 = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       fixed: 'left',
       sort: 'custom',
@@ -89,7 +89,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(
     },
 
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -803,7 +803,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -844,7 +844,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -860,27 +860,38 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm:false,
-    isTable:false,
-    hiddenInMain: true,
+    isTableForm: false,
     isForm: false,
-    tableForm:{
-      disabled:true
-    },
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    }
+    isSearch: true,
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm:false,
+  //   isTable:false,
+  //   hiddenInMain: true,
+  //   isForm: false,
+  //   tableForm:{
+  //     disabled:true
+  //   },
+  //   form: {
+  //     componentProps:{
+  //       disabled:true
+  //     }
+  //   }
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1129,7 +1140,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchCondition: [{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请填写物料代码',
+          message: '请填写品番',
           isTableRowValue: true, //查询当前searchTable表中行数据的值
           required:true,
           isMainValue:true
@@ -1158,7 +1169,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       multiple: true,
       // labelMessage: '信息提示说明！！！',
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码、批次、从库位代码',
+      searchListPlaceholder: '请选择品番、批次、从库位代码',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -1166,7 +1177,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key: 'itemCode',
         value: 'itemCode',
-        message: '请填写物料代码',
+        message: '请填写品番',
         isTableRowValue: true, //查询当前searchTable表中行数据的值
         required:true,
         isMainValue:false
@@ -1619,7 +1630,7 @@ export const PurchasereturnRequestDetailRules = reactive({
   //   { required: true, message: '请选择原因', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -1628,7 +1639,7 @@ export const PurchasereturnRequestDetailRules = reactive({
 
 export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1644,7 +1655,26 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物料名称',
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1656,7 +1686,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1668,7 +1698,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
index c681f4d4e..6fed88b78 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
@@ -49,7 +49,7 @@ const userDeptArray: any = [userDept]
 export const PurchasereturnRequestMainNew = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       isSearch: true,
@@ -61,7 +61,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
         componentProps: {
           enterSearch:true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -85,7 +85,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
index 52c0fb402..0533442aa 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
@@ -457,7 +457,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: false
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -467,7 +467,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortSearchDefault: 6,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -476,7 +476,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortSearchDefault: 6,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -486,7 +486,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain: true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
index 357557c69..3c2f39e96 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
@@ -33,7 +33,7 @@ const queryParams = {
 // 采购收货记录展示列
 export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     fixed: 'left',
     sort: 'custom',
@@ -80,7 +80,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>(
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -737,7 +737,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   },
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -805,7 +805,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -821,7 +821,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -841,7 +841,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1418,7 +1418,7 @@ export const PurchasereturnRequestDetailRules = reactive({
   //   { required: true, message: '请选择原因', trigger: 'change' }
   // ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -1427,7 +1427,7 @@ export const PurchasereturnRequestDetailRules = reactive({
 
 export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1443,7 +1443,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1455,7 +1455,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1467,7 +1467,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 3cb8946a7..a1a9e25b9 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -36,7 +36,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index 065224b82..c81b6eaee 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -765,7 +765,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -776,7 +776,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:3,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -785,16 +785,37 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:3,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+    sortTableDefault: 3,
+    sortSearchDefault: 2,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain: true,
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemdesc2',
     sort: 'custom',
     table: {
@@ -936,7 +957,7 @@ export const PutawayJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -1086,7 +1107,7 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1102,7 +1123,7 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1118,7 +1139,7 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1134,7 +1155,7 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemdesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
index 333dc6252..7df79ab40 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index 7a0c13fd3..7df5f1fe3 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -604,7 +604,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -615,7 +615,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:4,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -623,6 +623,27 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:4,
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+    sortSearchDefault: 2,
+    sortTableDefault: 4,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -663,7 +684,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -672,7 +693,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -801,7 +822,7 @@ export const PutawayRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -1078,7 +1099,7 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1153,7 +1174,7 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1169,7 +1190,7 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1185,7 +1206,7 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 761f37e8f..65e05a548 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index e84f02946..d05742109 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -598,7 +598,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -787,7 +787,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -798,18 +798,39 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isSearch: true,
+    sortSearchDefault: 2,
+    sortTableDefault: 3,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   isTableForm: false,
+  //   isForm: false
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -903,7 +924,7 @@ export const PutawayRequestDetailRules = reactive({
     { required: true, message: '请输入从库位代码', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
 })
 
@@ -985,7 +1006,7 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<Cr
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1193,7 +1214,7 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<Cr
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1211,7 +1232,7 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<Cr
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1219,17 +1240,38 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<Cr
     },
     isTableForm: false,
     isForm: false,
+    isSearch: true,
+    sortTableDefault: 8,
+    sortSearchDefault: 5,
+    tableForm: {
+      disabled: true
+    },
     form: {
       componentProps: {
-        disabled:true
+        disabled: true
       }
-    },
-    tableForm: {
-      disabled: true,
     }
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   form: {
+  //     componentProps: {
+  //       disabled:true
+  //     }
+  //   },
+  //   tableForm: {
+  //     disabled: true,
+  //   }
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
index 05d025955..0cdcd6c70 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
@@ -963,7 +963,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   sortTableDefault:1008,
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -973,7 +973,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch:true
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:7,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -992,7 +992,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:7,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1165,7 +1165,7 @@ export const PurchasereceiptJobDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
index 65c83c25e..74892f839 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -564,7 +564,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -574,7 +574,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isSearch: true
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -583,7 +583,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -593,7 +593,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     hiddenInMain:true
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 0d02d5313..9c70b40d0 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -758,7 +758,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -776,7 +776,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -787,7 +787,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -806,7 +806,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1410,7 +1410,7 @@ export const PurchasereceiptRequestDetailRules = reactive({
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
   qty: [
     { required: true, message: '请输入收货数量', trigger: 'change' }
@@ -1505,7 +1505,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1521,7 +1521,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1533,7 +1533,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1545,7 +1545,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 92724f740..b95ab7646 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -92,7 +92,7 @@ export const Version = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch:true,
     sort: 'custom',
@@ -160,6 +160,16 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.DEMANDFORECASTING_STATUS,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '订单号',
     field: 'poNumber',
@@ -177,7 +187,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     
@@ -190,7 +200,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         multiple: true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
@@ -209,6 +219,16 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '版本号',
     field: 'version',
@@ -235,7 +255,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'itemCodes',
           value: 'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true,
           isCSV:true,//是否用逗号分隔参数
         },{
@@ -496,7 +516,7 @@ export const DemandforecastingDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -539,13 +559,22 @@ export const DemandforecastingMainPlan = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计划日期',
     field: 'dueDate',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 46fa01fc7..3f98521ed 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -39,29 +39,28 @@
     </Table>
   </ContentWrap>
   <!-- :vLoading="formLoadingPlan" -->
-  <Dialog title="预览要货计划"
-    v-model="dialogVisiblePlan"
-    width="80%"
-    :close-on-click-modal="false"
-  >
-    <Table 
-      ref="tablePlanRef"
-      :selection="true"
-      :columns="tableColumnsPlan"
-      :data="tableObjectPlan.tableList"
-      :loading="tableObjectPlan.loading"
-      v-model:pageSize="tableObjectPlan.pageSize"
-      v-model:currentPage="tableObjectPlan.currentPage"
-      v-model:sort="tableObjectPlan.sort"
-      @getSelectionRows="getSelectionRowsPlan"
-    />
-    <template #footer>
-      <slot name="foorter"></slot>
-      <ButtonBase :Butttondata="[
-        defaultButtons.formSaveBtn(null), // 保存
-        defaultButtons.formCloseBtn(null) // 关闭
-      ]" @button-base-click="buttonBaseClickPlan" />
-    </template>
+  <Dialog title="预览要货计划" v-model="dialogVisiblePlan" width="80%" :close-on-click-modal="false" >
+    <div v-loading="formLoadingPlan">
+      <Table 
+        ref="tablePlanRef"
+        :selection="true"
+        :columns="tableColumnsPlan"
+        :data="tableObjectPlan.tableList"
+        :loading="tableObjectPlan.loading"
+        v-model:pageSize="tableObjectPlan.pageSize"
+        v-model:currentPage="tableObjectPlan.currentPage"
+        v-model:sort="tableObjectPlan.sort"
+        @getSelectionRows="getSelectionRowsPlan"
+      />
+      <div style="padding-top: 20px;text-align: right;">
+        <slot name="foorter"></slot>
+        <ButtonBase :Butttondata="[
+          defaultButtons.formSaveBtn(null), // 保存 
+          defaultButtons.formCloseBtn(null) // 关闭 
+          ]"
+         @button-base-click="buttonBaseClickPlan" />
+      </div>
+    </div>
   </Dialog>
 
 
@@ -76,6 +75,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { isString } from '@/utils/is'
+import {publish} from "@/api/wms/demandforecastingMain";
 
 const { loadStart, loadDone } = usePageLoading()
 // 要货预测
@@ -94,7 +94,7 @@ const updataTableColumns = (val) => {
   orginTableColumns.value = val
 }
 
-
+const formLoadingPlan = ref(false)
 
 // 查询页面返回
 const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row ) => {
@@ -102,7 +102,7 @@ const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row
   nextTick(() => {
     const setV = {}
     if(formField == 'supplierCode'||formField == 'itemCode'||formField == 'version'){
-      //供应商代码 物料代码 版本号
+      //供应商代码 品番 版本号
       let list = []
       val.forEach(item=>{
         list.push(item[searchField])
@@ -199,13 +199,31 @@ const buttonBaseClick = async (val, item) => {
     console.log('其他按钮', item)
   }
 }
+
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   return [
     {
       label: t(`ts.生成要货计划`).replace('ts.', ''),
       name: 'previewPlan',
-      hide: !(row['planType_F'].length>0&&(!tableObject.params.version || tableObject.params.version.length == 0)),
+      hide: isShowMainButton(row, ['2']) || !(row['planType_F'].length>0&&(!tableObject.params.version || tableObject.params.version.length == 0)),
+      type: 'primary',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: ''
+    },
+    {
+      label: '发布',
+      name: 'publish',
+      hide: isShowMainButton(row, ['1']),
       type: 'primary',
       color: '',
       link: true, // 文本展现按钮
@@ -219,10 +237,19 @@ const buttonTableClick = async (val, row) => {
   if (val == 'previewPlan') { // 生成要货计划
     tableObjectPlan.params.masterIds = row.mainId
     handlePreviewPlan()
-  } 
+  } else if(val == 'publish') {
+    handlePublish(row)
+  }
 }
 
-
+const handlePublish = (row)=>{
+  DemandforecastingMainApi.publish({id:row.mainId}).then(res => {
+    console.log('res',res);
+    getList()
+  }).catch(err => {
+    console.log(err)
+  })
+}
 
 
 
@@ -292,17 +319,23 @@ const handlePreviewPlan = async ()=>{
 const buttonBaseClickPlan = async (val)=>{
   if (val == 'save') {
     // 保存
-    dialogVisiblePlan.value = false
-    let rows: any = []
-    selectionPlanRows.value.forEach((item) => {
-      rows = [...rows, ...item.selectionRows.map((item1) => item1.id)]
-    })
-    console.log('预览要货计划', selectionPlanRows.value)
-    console.log('预览要货计划', rows.join(','))
-    let res = await DemandforecastingDetailApi.generateOrderPlan(rows)
-    message.success(t('common.submitSuccess'))
-    buttonBaseClick('refresh', null)
-    console.log('保存',res)
+    formLoadingPlan.value =true
+    try {
+       let rows: any = []
+      selectionPlanRows.value.forEach((item) => {
+        rows = [...rows, ...item.selectionRows.map((item1) => item1.id)]
+      })
+      console.log('预览要货计划', selectionPlanRows.value)
+      console.log('预览要货计划', rows.join(','))
+      let res = await DemandforecastingDetailApi.generateOrderPlan(rows)
+      message.success(t('common.submitSuccess'))
+      buttonBaseClick('refresh', null)
+      dialogVisiblePlan.value = false
+      console.log('保存',res)
+    } finally {
+      formLoadingPlan.value =false
+    }
+   
   }
   // 关闭
   else if (val == 'close') {
@@ -357,7 +390,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await DemandforecastingMainApi.exportDemandforecastingMain(tableObject.params)
+    const data = await DemandforecastingMainApi.exportDemandforecastingPlannnerMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
@@ -400,4 +433,4 @@ onMounted(async () => {
   color:var(--el-color-success);
   font-weight:700;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index 2ffc91738..64ed8c744 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -38,7 +38,7 @@ export const Version = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch:true,
     sort: 'custom',
@@ -75,7 +75,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -90,7 +90,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         multiple: true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
@@ -109,6 +109,16 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '版本号',
     field: 'version',
@@ -137,7 +147,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'itemCodes',
           value: 'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true,
           isCSV:true,//是否用逗号分隔参数
         },{
@@ -390,7 +400,7 @@ export const DemandforecastingDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index 49eb20d07..590f4cbe8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -76,7 +76,7 @@ const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row
   nextTick(() => {
     const setV = {}
     if(formField == 'supplierCode'||formField == 'itemCode'||formField == 'version'){
-      //供应商代码 物料代码 版本号
+      //供应商代码 品番 版本号
       let list = []
       val.forEach(item=>{
         list.push(item[searchField])
@@ -136,7 +136,7 @@ watch(()=>tableObject.currentPage,async ()=>{
 })
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecastingSupplier-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -180,6 +180,7 @@ const buttonBaseClick = async (val, item) => {
 
 const searchClick = async (data)=>{
   data.flag = 1
+  data.status = 2
   console.log('searchClick',data)
   await setSearchParamsHead(data)
   // updateDateTableColumns()
@@ -290,4 +291,4 @@ onMounted(async () => {
   color:var(--el-color-success);
   font-weight:700;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 2f29232e5..6128dfc92 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -148,7 +148,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
             })
           }
           if(repeatCode.length>0){
-            message.warning(`${t('ts.物料代码')}${repeatCode.join(',')}${t('ts.已经存在')}`);
+            message.warning(`${t('ts.品番')}${repeatCode.join(',')}${t('ts.已经存在')}`);
           }
           if(val.length>0){
             //frm表单回显
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index f4f225edb..3988ef713 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -17,11 +17,33 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    sortTableDefault: 1,
     table: {
       width: 180,
       fixed: 'left'
     },
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: false,
+    isSearch: true,
+    sortSearchDefault: 1000,
+    sortTableDefault: 2,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -31,7 +53,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
-      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+      labelMessage: '影响明细中品番，需在供应商物料中维护',
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
@@ -54,54 +76,50 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true
         }], // 失去焦点校验参数
       }
-    }
-  },
-  {
-    label: '订单类型',
-    field: 'type',
-    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    isSearch: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
+    sortTableDefault: 3,
   },
   {
-    label: '行类型',
-    field: 'poLineType',
+    label: '供应商名称',
+    field: 'supplierName',
+    dictClass: 'string',
     isTable: true,
-    isSearch: true,
+    isSearch: false,
+    isForm: false,
     sort: 'custom',
+    sortTableDefault:4,
     table: {
       width: 150
     },
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
     dictClass: 'string',
     isTable: true,
-    isForm:false,
     isSearch: true,
-    sortSearchDefault:1000,
     sort: 'custom',
+    sortTableDefault: 5,
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
+  // {
+  //   label: '行类型',
+  //   field: 'poLineType',
+  //   isTable: false,
+  //   isSearch: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+ 
   {
     label: '订单日期',
     field: 'orderDate',
-    isTable: true,
+    isTable: false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -110,6 +128,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 6,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -134,6 +153,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 7,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -144,6 +164,15 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '税率',
     field: 'taxRate',
@@ -151,6 +180,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -162,52 +192,41 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '订单备注',
-    field: 'poRmks',
+    label: '支付周期',
+    field: 'paymentCycle',
     sort: 'custom',
-    isTable:true,
-    isForm:false,
+    isTable: false,
+    isForm: false,
     table: {
       width: 150
     },
   },
-
   {
-    label: '管理编号',
-    field: 'poContract',
+    label: '联系人姓名',
+    field: 'contactName',
     sort: 'custom',
-    isTable:true,
-    isForm:false,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '版本',
-    field: 'version',
+    label: '联系人电话',
+    field: 'contactPhone',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '当前阶段',
-    field: 'currentStage',
+    label: '联系人电子邮件',
+    field: 'contactEmail',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        style: {width:'100%'},
-        min: 0
-      }
-    },
-    isTableForm: false,
-    isForm: false,
-    isTable:false,
   },
   {
     label: '是否寄存订单',
@@ -219,7 +238,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm:false,
+    isForm: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -230,54 +249,27 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
+    label: '订单备注',
+    field: 'poRmks',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+    isTable: false,
     isForm:false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    },
-  },
-  {
-    label: '联系人姓名',
-    field: 'contactName',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '联系人电话',
-    field: 'contactPhone',
-    sort: 'custom',
-    isTable:false,
     table: {
       width: 150
     },
   },
+
   {
-    label: '联系人电子邮件',
-    field: 'contactEmail',
+    label: '管理编号',
+    field: 'poContract',
     sort: 'custom',
-    isTable:false,
+    isTable:true,
+    isForm:false,
     table: {
       width: 150
     },
   },
-  
+
   {
     label: '业务类型',
     field: 'businessType',
@@ -294,20 +286,52 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+
+  {
+    label: '数据来源区分',
+    field: 'dataSource',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    form: {
+    }
+  },
+  // {
+  //   label: '当前阶段',
+  //   field: 'currentStage',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       min: 0
+  //     }
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   isTable:false,
+  // },
   {
     label: '创建者',
     field: 'creator',
     sort: 'custom',
     isForm: false,
-    isTable:false,
+    isTable: true,
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
   },
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:false,
+    isTable:true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -335,48 +359,17 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault: 1000,
   },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    isForm: false,
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    isTable: false,
-    table: {
-      width: 150
-    },
-  },
+  
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   isTable: false,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '操作',
     field: 'action',
@@ -432,20 +425,6 @@ export const PurchaseMainRules = reactive({
  * @returns {Array} 采购订单子表
  */
 export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    isTableForm: false,
-    hiddenInMain:true,
-    table: {
-      width: 180
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '行号',
     field: 'lineNumber',
@@ -458,7 +437,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch: true,
     table: {
@@ -527,29 +506,30 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
- {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    isTableForm:true,
-    form:{
-      componentProps: {
-        disabled:true
-      }
+  {
+    label: '背番',
+    field: 'backNumber',
+    table: {
+      width: 150
     },
+    isSearch:true,
+    hiddenSearchHigh:true,
     tableForm:{
-      disabled: true,
-      type:'Select',
-    },
+      disabled:true,
+    }
+  },
+  {
+    label: '行类型',
+    field: 'poLineType',
+    isTable: true,
+    isSearch: false,
+    sort: 'custom',
     table: {
       width: 150
     },
- },
+  },
   {
-    label: '订单数量',
+    label: '采购订单数量',
     field: 'orderQty',
     table: {
       width: 150
@@ -557,78 +537,86 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled:false,
+        disabled: false,
         min: 1,
         precision: 6
       }
     },
     tableForm: {
-      disabled:false,
-      hidden:false,
+      disabled: false,
+      hidden: false,
       type: 'InputNumber',
       min: 1,
       precision: 6
     },
   },
   {
-    label: '默认收货库区',
-    field: 'defaultAreaCode',
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
     table: {
       width: 150
     },
     form: {
+      component: 'InputNumber',
       componentProps: {
-        disabled: true
+        disabled: false,
+        min: 1,
+        precision: 6
       }
     },
-    isTableForm: false,
-    isForm: false,
-    isTable: true,
+    hiddenInMain: true,
+    tableForm: {
+      disabled: false,
+      hidden: false,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
   },
   {
-    label: '库区描述',
-    field: 'areaDescription',
-    table: {
-      width: 150
-    },
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: true,
     form: {
       componentProps: {
         disabled: true
       }
     },
-    isTableForm: false,
-    isForm: false,
-    isTable: true,
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+    },
+    table: {
+      width: 150
+    },
   },
-  // {
-  //   label: 'ERP库位',
-  //   field: 'erpLocationCode',
-  //   dictType : DICT_TYPE.ERP_LOCATION,
-  //   dictClass: 'string',
-  //   table: {
-  //     width: 150
-  //   },
-  //   hiddenInMain:true,
-  //   isTableForm: false,
-  //   isForm: false,
-  // },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '转换率',
+    field: 'convertRate',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    hiddenInMain: true,
     table: {
       width: 150
     },
-    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
   {
-    label: '包装数量',
-    field: 'packQty',
-    hiddenInMain:true,
+    label: t('ts.单价'),
+    field: 'singlePrice',
     table: {
       width: 150
     },
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -637,25 +625,29 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTableForm: false,
-    isForm: false,
+    isForm: false
   },
   {
-    label: '包装规格',
-    hiddenInMain:true,
-    field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
-    isTable: true,
+    label: '金额',
+    field: 'amount',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
     isTableForm: false,
-    isForm: false,
+    isForm: false
   },
   {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    hiddenInMain:true,
+    label: '库存标包数量',
+    field: 'packQty',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -669,13 +661,14 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
+  
   {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+    label: '库存标包规格',
+    hiddenInMain: true,
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
-    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -683,42 +676,60 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '转换率',
-    field: 'convertRate',
+    label: '库存计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: true,
+    hiddenInMain: true,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 0
+        disabled: true
       }
     },
-    hiddenInMain:true,
-     table: {
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+    },
+    table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
   },
+
+ 
   // {
-  //   label: t('ts.已计划数量'),
-  //   field: 'plannedQty',
+  //   label: 'ERP库位',
+  //   field: 'erpLocationCode',
+  //   dictType : DICT_TYPE.ERP_LOCATION,
+  //   dictClass: 'string',
   //   table: {
   //     width: 150
   //   },
   //   hiddenInMain:true,
-  //   form: {
-  //     component: 'InputNumber',
-  //     componentProps: {
-  //       min: 1,
-  //       precision: 6
-  //     },
-  //     value: 1
-  //   },
   //   isTableForm: false,
   //   isForm: false,
+  //   isTable: false,
   // },
   {
-    label: t('ts.已发货数量'),
-    field: 'shippedQty',
+    label: '默认收货库区',
+    field: 'defaultAreaCode',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: true,
+  },
+  {
+    label: '已计划采购数量',
+    field: 'plannedPurchaseQty',
     table: {
       width: 150
     },
@@ -735,30 +746,30 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: t('ts.已收货数量'),
-    field: 'receivedQty',
+    label: '已发货采购数量',
+    field: 'shippedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
-      value: 0,
       componentProps: {
         min: 1,
         precision: 6
-      }
+      },
+      value: 1
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
   },
   {
-    label: t('ts.已退货数量'),
-    field: 'returnedQty',
+    label: '已收货采购数量',
+    field: 'receivedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       value: 0,
@@ -771,15 +782,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: t('ts.已上架数量'),
-    field: 'putawayQty',
+    label:'已退货采购数量',
+    field: 'returnedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
-      value: 1,
+      value: 0,
       componentProps: {
         min: 1,
         precision: 6
@@ -789,14 +800,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: t('ts.单价'),
-    field: 'singlePrice',
+    label: "已上架采购数量",
+    field: 'putawayPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
+      value: 1,
       componentProps: {
         min: 1,
         precision: 6
@@ -805,48 +817,69 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
+ 
+ 
   {
-    label: '金额',
-    field: 'amount',
+    label: '库区描述',
+    field: 'areaDescription',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 1,
-        precision: 6
+        disabled: true
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
+
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
+    label: '项目代码',
+    field: 'projectCode',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false,
+    isTable: false,
+  },
+ 
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
     hiddenInMain:true,
-    tableForm:{
-      type:'Select',
-      default: 'TRUE',
-      inactiveValue: 'FALSE',
-      activeValue: 'TRUE'
+    table: {
+      width: 150
     },
     form: {
-      component: 'Switch',
-      value: 'TRUE',
+      component: 'InputNumber',
       componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        min: 1,
+        precision: 6
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: false,
+    hiddenInMain:true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
   },
+  
   {
     label: '超收百分比',
     field: 'overReceivingPercent',
@@ -867,53 +900,19 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0
     }
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    isTable: true,
-    isTableForm: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    hiddenInMain:false,
-    isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    hiddenInMain:false,
-    isForm: false,
-  },
   // {
-  //   label: '最后更新时间',
-  //   field: 'updateTime',
-  //   isTableForm: false,
+  //   label: '创建时间',
+  //   field: 'createTime',
   //   isTable: true,
-  //   hiddenInMain:false,
+  //   isTableForm: false,
   //   formatter: dateFormatter,
   //   detail: {
   //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
   //   },
   //   table: {
-  //     width: 150
+  //     width: 180
   //   },
+  //   hiddenInMain:false,
   //   isForm: false,
   //   form: {
   //     component: 'DatePicker',
@@ -926,23 +925,14 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   }
   // },
   // {
-  //   label: '最后更新者',
-  //   field: 'updater',
+  //   label: '创建者',
+  //   field: 'creator',
   //   isTableForm: false,
   //   table: {
   //     width: 150
   //   },
   //   hiddenInMain:false,
   //   isForm: false,
-  //   // form: {
-  //   //   component: 'DatePicker',
-  //   //   componentProps: {
-  //   //     style: {width:'100%'},
-  //   //     type: 'datetime',
-  //   //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //   //     valueFormat: 'x',
-  //   //   }
-  //   // }
   // },
   {
     label: '备注',
@@ -951,6 +941,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '操作',
@@ -1012,7 +1003,7 @@ export const PurchaseDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode:  [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue
index fe8028ee6..e0d269122 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue
@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -148,7 +148,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
             })
           }
           if(repeatCode.length>0){
-            message.warning(`${t('ts.物料代码')}${repeatCode.join(',')}${t('ts.已经存在')}`);
+            message.warning(`${t('ts.品番')}${repeatCode.join(',')}${t('ts.已经存在')}`);
           }
           if(val.length>0){
             //frm表单回显
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
index e3cf86b8e..ac0c2f56b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
@@ -17,11 +17,33 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    sortTableDefault: 1,
     table: {
       width: 180,
       fixed: 'left'
     },
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: false,
+    isSearch: true,
+    sortSearchDefault: 1000,
+    sortTableDefault: 2,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -31,7 +53,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
-      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+      labelMessage: '影响明细中品番，需在供应商物料中维护',
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
@@ -54,54 +76,50 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true
         }], // 失去焦点校验参数
       }
-    }
-  },
-  {
-    label: '订单类型',
-    field: 'type',
-    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    isSearch: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
+    sortTableDefault: 3,
   },
   {
-    label: '行类型',
-    field: 'poLineType',
+    label: '供应商名称',
+    field: 'supplierName',
+    dictClass: 'string',
     isTable: true,
-    isSearch: true,
+    isSearch: false,
+    isForm: false,
     sort: 'custom',
+    sortTableDefault: 4,
     table: {
       width: 150
     },
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
     dictClass: 'string',
     isTable: true,
-    isForm:false,
     isSearch: true,
-    sortSearchDefault:1000,
     sort: 'custom',
+    sortTableDefault: 5,
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
+  // {
+  //   label: '行类型',
+  //   field: 'poLineType',
+  //   isTable: false,
+  //   isSearch: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+
   {
     label: '订单日期',
     field: 'orderDate',
-    isTable: true,
+    isTable: false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -110,10 +128,11 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 6,
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -127,23 +146,33 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false,
     formatter: dateFormatter2,
-    detail:{
+    detail: {
       dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
       width: 180
     },
+    sortTableDefault: 7,
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
   },
+  {
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '税率',
     field: 'taxRate',
@@ -151,10 +180,11 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         min: 0,
         max: 1,
         precision: 6,
@@ -162,52 +192,41 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '订单备注',
-    field: 'poRmks',
+    label: '支付周期',
+    field: 'paymentCycle',
     sort: 'custom',
-    isTable:true,
-    isForm:false,
+    isTable: false,
+    isForm: false,
     table: {
       width: 150
     },
   },
-
   {
-    label: '管理编号',
-    field: 'poContract',
+    label: '联系人姓名',
+    field: 'contactName',
     sort: 'custom',
-    isTable:true,
-    isForm:false,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '版本',
-    field: 'version',
+    label: '联系人电话',
+    field: 'contactPhone',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '当前阶段',
-    field: 'currentStage',
+    label: '联系人电子邮件',
+    field: 'contactEmail',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        style: {width:'100%'},
-        min: 0
-      }
-    },
-    isTableForm: false,
-    isForm: false,
-    isTable:false,
   },
   {
     label: '是否寄存订单',
@@ -219,7 +238,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm:false,
+    isForm: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -230,54 +249,27 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm:false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    },
-  },
-  {
-    label: '联系人姓名',
-    field: 'contactName',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '联系人电话',
-    field: 'contactPhone',
+    label: '订单备注',
+    field: 'poRmks',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
+    isForm: false,
     table: {
       width: 150
     },
   },
+
   {
-    label: '联系人电子邮件',
-    field: 'contactEmail',
+    label: '管理编号',
+    field: 'poContract',
     sort: 'custom',
-    isTable:false,
+    isTable: true,
+    isForm: false,
     table: {
       width: 150
     },
   },
-  
+
   {
     label: '业务类型',
     field: 'businessType',
@@ -294,20 +286,52 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+
+  {
+    label: '数据来源区分',
+    field: 'dataSource',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    form: {
+    }
+  },
+  // {
+  //   label: '当前阶段',
+  //   field: 'currentStage',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       min: 0
+  //     }
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   isTable:false,
+  // },
   {
     label: '创建者',
     field: 'creator',
     sort: 'custom',
     isForm: false,
-    isTable:false,
+    isTable: true,
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
   },
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -320,7 +344,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -335,48 +359,17 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault: 1000,
   },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    isForm: false,
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    isTable: false,
-    table: {
-      width: 150
-    },
-  },
+
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   isTable: false,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '操作',
     field: 'action',
@@ -394,7 +387,7 @@ export const PurchaseMainRules = reactive({
   supplierCode: [
     { required: true, message: '请输入供应商代码', trigger: 'change' }
   ],
-  type:  [
+  type: [
     { required: true, message: '请选择订单类型', trigger: 'change' }
   ],
   status: [
@@ -403,27 +396,27 @@ export const PurchaseMainRules = reactive({
   orderDate: [
     { required: true, message: '请输入订单日期', trigger: 'change' }
   ],
-  taxRate:  [
+  taxRate: [
     { required: true, message: '请输入税率', trigger: 'blur' }
   ],
-  version:  [
+  version: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  contactName:  [
+  contactName: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  contactPhone:  [
+  contactPhone: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+    { validator: validateHanset, message: '请输入正确的手机号', trigger: 'blur' }
   ],
-  contactEmail:  [
+  contactEmail: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'}
+    { validator: validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur' }
   ],
-  remark:  [
+  remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  available:  [
+  available: [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
 })
@@ -432,41 +425,27 @@ export const PurchaseMainRules = reactive({
  * @returns {Array} 采购订单子表
  */
 export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    isTableForm: false,
-    hiddenInMain:true,
-    table: {
-      width: 180
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '行号',
     field: 'lineNumber',
     table: {
       width: 150
     },
-    tableForm:{
-      disabled:true,
+    tableForm: {
+      disabled: true,
       isSearchList: true, // 开启查询弹窗
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch: true,
     table: {
       width: 150
     },
-    tableForm:{
-      disabled:true,
-      multiple:true,//多选
+    tableForm: {
+      disabled: true,
+      multiple: true,//多选
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择供应商物料',
       searchField: 'itemCode',
@@ -474,16 +453,16 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchAllSchemas: Supplieritem.allSchemas,
       searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
       searchCondition: [{
-        key:'supplierCode',
-        value:'supplierCode',
+        key: 'supplierCode',
+        value: 'supplierCode',
         message: '请填写供应商代码！',
         isMainValue: true
-      },{
+      }, {
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-        }],
-      verificationPage:  SupplieritemApi.getSupplierItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
+      }],
+      verificationPage: SupplieritemApi.getSupplierItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
       isShowTableFormSearch: true, //tableForm下方是否出现输入框
       isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
       // 失去焦点校验参数
@@ -504,16 +483,16 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'itemCode',
         searchTitle: '供应商物料信息',
         searchAllSchemas: Supplieritem.allSchemas,
-      searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
-      searchCondition: [{
-        key:'supplierCode',
-        value:'supplierCode',
-        message: '请填写供应商代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
+        searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
+        searchCondition: [{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true
+        }, {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
         }],
         // 失去焦点校验参数
         verificationParams: [{
@@ -527,29 +506,29 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
- {
-    label: '计量单位',
-    field: 'uom',
+  {
+    label: '背番',
+    field: 'backNumber',
     sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    isTableForm:true,
-    form:{
-      componentProps: {
-        disabled:true
-      }
-    },
-    tableForm:{
-      disabled: true,
-      type:'Select',
+    table: {
+      width: 150
     },
+    isTableForm: false,
+    isForm: false,
+    isSearch:true,
+  },
+  {
+    label: '行类型',
+    field: 'poLineType',
+    isTable: true,
+    isSearch: false,
+    sort: 'custom',
     table: {
       width: 150
     },
- },
+  },
   {
-    label: '订单数量',
+    label: '采购订单数量',
     field: 'orderQty',
     table: {
       width: 150
@@ -557,68 +536,86 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled:false,
+        disabled: false,
         min: 1,
         precision: 6
       }
     },
     tableForm: {
-      disabled:false,
-      hidden:false,
+      disabled: false,
+      hidden: false,
       type: 'InputNumber',
       min: 1,
       precision: 6
     },
   },
   {
-    label: '默认收货库区',
-    field: 'defaultAreaCode',
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
-    isTable: true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: false,
+        min: 1,
+        precision: 6
+      }
+    },
+    hiddenInMain: true,
+    tableForm: {
+      disabled: false,
+      hidden: false,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
   },
   {
-    label: '库区描述',
-    field: 'areaDescription',
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+    },
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
-    isTable: true,
   },
-  // {
-  //   label: 'ERP库位',
-  //   field: 'erpLocationCode',
-  //   dictType : DICT_TYPE.ERP_LOCATION,
-  //   dictClass: 'string',
-  //   table: {
-  //     width: 150
-  //   },
-  //   hiddenInMain:true,
-  //   isTableForm: false,
-  //   isForm: false,
-  // },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '转换率',
+    field: 'convertRate',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    hiddenInMain: true,
     table: {
       width: 150
     },
-    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
   {
-    label: '包装数量',
-    field: 'packQty',
-    hiddenInMain:true,
+    label: t('ts.单价'),
+    field: 'singlePrice',
     table: {
       width: 150
     },
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -626,26 +623,32 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         precision: 6
       }
     },
+    isTable:false,
     isTableForm: false,
-    isForm: false,
+    isForm: false
   },
   {
-    label: '包装规格',
-    hiddenInMain:true,
-    field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
-    isTable: true,
+    label: '金额',
+    field: 'amount',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
     isTableForm: false,
-    isForm: false,
+    isForm: false
   },
   {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    hiddenInMain:true,
+    label: '库存标包数量',
+    field: 'packQty',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -659,13 +662,14 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
+
   {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+    label: '库存标包规格',
+    hiddenInMain: true,
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
-    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -673,46 +677,64 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '转换率',
-    field: 'convertRate',
+    label: '库存计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: true,
+    hiddenInMain: true,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 0
+        disabled: true
       }
     },
-    hiddenInMain:true,
-     table: {
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+    },
+    table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
   },
+
+
   // {
-  //   label: t('ts.已计划数量'),
-  //   field: 'plannedQty',
+  //   label: 'ERP库位',
+  //   field: 'erpLocationCode',
+  //   dictType : DICT_TYPE.ERP_LOCATION,
+  //   dictClass: 'string',
   //   table: {
   //     width: 150
   //   },
   //   hiddenInMain:true,
-  //   form: {
-  //     component: 'InputNumber',
-  //     componentProps: {
-  //       min: 1,
-  //       precision: 6
-  //     },
-  //     value: 1
-  //   },
   //   isTableForm: false,
   //   isForm: false,
+  //   isTable: false,
   // },
   {
-    label: t('ts.已发货数量'),
-    field: 'shippedQty',
+    label: '默认收货库区',
+    field: 'defaultAreaCode',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: true,
+  },
+  {
+    label: '已计划采购数量',
+    field: 'plannedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -725,30 +747,30 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: t('ts.已收货数量'),
-    field: 'receivedQty',
+    label: '已发货采购数量',
+    field: 'shippedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
-      value: 0,
       componentProps: {
         min: 1,
         precision: 6
-      }
+      },
+      value: 1
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
   },
   {
-    label: t('ts.已退货数量'),
-    field: 'returnedQty',
+    label: '已收货采购数量',
+    field: 'receivedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       value: 0,
@@ -761,15 +783,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: t('ts.已上架数量'),
-    field: 'putawayQty',
+    label: '已退货采购数量',
+    field: 'returnedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
-      value: 1,
+      value: 0,
       componentProps: {
         min: 1,
         precision: 6
@@ -779,14 +801,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: t('ts.单价'),
-    field: 'singlePrice',
+    label: "已上架采购数量",
+    field: 'putawayPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
+      value: 1,
       componentProps: {
         min: 1,
         precision: 6
@@ -795,115 +818,102 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
+
+
   {
-    label: '金额',
-    field: 'amount',
+    label: '库区描述',
+    field: 'areaDescription',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 1,
-        precision: 6
+        disabled: true
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
+
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
+    label: '项目代码',
+    field: 'projectCode',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    tableForm:{
-      type:'Select',
-      default: 'TRUE',
-      inactiveValue: 'FALSE',
-      activeValue: 'TRUE'
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false,
+    isTable: false,
+  },
+
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    hiddenInMain: true,
+    table: {
+      width: 150
     },
     form: {
-      component: 'Switch',
-      value: 'TRUE',
+      component: 'InputNumber',
       componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        min: 1,
+        precision: 6
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: false,
   },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: false,
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+
   {
     label: '超收百分比',
     field: 'overReceivingPercent',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       componentProps: {
         min: 0
       }
     },
-    isTable:false,
-    isTableForm:false,
+    isTable: false,
+    isTableForm: false,
     tableForm: {
       type: 'InputNumber',
       min: 0
     }
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    isTable: true,
-    isTableForm: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    hiddenInMain:false,
-    isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    hiddenInMain:false,
-    isForm: false,
-  },
   // {
-  //   label: '最后更新时间',
-  //   field: 'updateTime',
-  //   isTableForm: false,
+  //   label: '创建时间',
+  //   field: 'createTime',
   //   isTable: true,
-  //   hiddenInMain:false,
+  //   isTableForm: false,
   //   formatter: dateFormatter,
   //   detail: {
   //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
   //   },
   //   table: {
-  //     width: 150
+  //     width: 180
   //   },
+  //   hiddenInMain:false,
   //   isForm: false,
   //   form: {
   //     component: 'DatePicker',
@@ -916,54 +926,45 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   }
   // },
   // {
-  //   label: '最后更新者',
-  //   field: 'updater',
+  //   label: '创建者',
+  //   field: 'creator',
   //   isTableForm: false,
   //   table: {
   //     width: 150
   //   },
   //   hiddenInMain:false,
   //   isForm: false,
-  //   // form: {
-  //   //   component: 'DatePicker',
-  //   //   componentProps: {
-  //   //     style: {width:'100%'},
-  //   //     type: 'datetime',
-  //   //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //   //     valueFormat: 'x',
-  //   //   }
-  //   // }
   // },
   {
     label: '备注',
-    hiddenInMain:true,
+    hiddenInMain: true,
     field: 'remark',
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '操作',
-    hiddenInMain:true,
+    hiddenInMain: true,
     field: 'action',
     isDetail: false,
-    isForm: false ,
-    isTable: false ,
+    isForm: false,
     table: {
       width: 150,
       fixed: 'right'
     },
-    isTableForm:false,
+    isTableForm: false,
   }
 ]))
 
 //表单校验
 export const PurchaseDetailRules = reactive({
   lineNumber: [
-    { required: true, message: '请输入行号', trigger: 'blur' }, 
+    { required: true, message: '请输入行号', trigger: 'blur' },
     // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  packQty:  [
+  packQty: [
     { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
   packUnit: [
@@ -972,40 +973,40 @@ export const PurchaseDetailRules = reactive({
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
   ],
-  taxRate:  [
+  taxRate: [
     { required: true, message: '请输入税率', trigger: 'blur' }
   ],
-  shippedQty:  [
+  shippedQty: [
     { required: true, message: '请输入已发货数量', trigger: 'blur' }
   ],
-  receivedQty:  [
+  receivedQty: [
     { required: true, message: '请输入已收货数量', trigger: 'blur' }
   ],
-  returnedQty:  [
+  returnedQty: [
     { required: true, message: '请输入已退货数量', trigger: 'blur' }
   ],
-  putawayQty:  [
+  putawayQty: [
     { required: true, message: '请输入已上架数量', trigger: 'blur' }
   ],
-  overReceivingPercent:  [
+  overReceivingPercent: [
     { required: true, message: '请输入超收百分比', trigger: 'blur' }
   ],
-  orderQty:  [
+  orderQty: [
     { required: true, message: '请输入订单数量', trigger: 'blur' }
   ],
   // uom:  [
   //   { required: true, message: '请选择计量单位', trigger: 'change' }
   // ],
-  available:  [
+  available: [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
-  nuumber:  [
+  nuumber: [
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
-  itemCode:  [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+  itemCode: [
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
-  remark:  [
+  remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
 })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index ad01b90e2..19bef105e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -67,6 +67,7 @@
     :isShowReduceButton="false" 
     :isShowButton="false"
     @handleAddTable="handleAddTable" 
+    @clearSearchInput="clearSearchInput"
     @handleDeleteTable="handleDeleteTable"
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess" 
@@ -90,7 +91,7 @@
     :detailButtonIsShowAddStatusArray="['1','3','4','5','6']"
     :detailButtonIsShowEdit="detailData.type == 'SCHEDULE'&& detailData.status  != 4"
     :detailButtonIsShowDelete="detailData.type == 'SCHEDULE'&& detailData.status  != 4"
-    :detailButtonIsShowAdd="detailData.type == 'SCHEDULE'&& detailData.status  != 4"
+    :detailButtonIsShowAdd="false"
     addHasPermi="wms:purchase-plan-main:create"
     editHasPermi="wms:purchase-plan-main:update"
     deleteHasPermi="wms:purchase-plan-main:delete"
@@ -202,7 +203,7 @@ const { loadStart, loadDone } = usePageLoading()
         val.forEach(item=>{
           if(tableData.value.find(item1=>item1['id'] == item['id'])) return
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
-          
+
           newRow[formField] = item[searchField]
           newRow['itemCode'] = item['code']
           newRow['poNumber'] = item['number']
@@ -231,6 +232,16 @@ const { loadStart, loadDone } = usePageLoading()
         setV['itemCode'] = val[0]['code']
         setV['poNumber'] = val[0]['number']
         setV['poLine'] = val[0]['lineNumber']
+        setV['receivedNumber'] = val[0]['receivedNumber']
+        console.log(PurchasePlanDetail.allSchemas.tableFormColumns);
+        
+        PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item =>{
+        if(item.value == ''){
+          if(item.field == 'receivedNumber'){
+            item.tableForm.placeholder = ''
+          }
+        }
+      })
         
         if(formField == 'supplierCode'){
           setV['supplierCode'] = val[0]['code']
@@ -461,7 +472,7 @@ const isShowMainButton1 = (row, val) => {
     return [
       // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
       defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE'),hasPermi: 'wms:purchase-plan-main:close' }), // 关闭
-      defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1','5']) ,hasPermi: 'wms:purchase-plan-main:publish'}), // 发布
+      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'}), // 下架
@@ -469,7 +480,7 @@ const isShowMainButton1 = (row, val) => {
       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.创建供应商发货申请'),
+        label: t('ts.创建发货申请'),
         name: 'supplierdeliver',
         hide: isShowMainButton(row, ['4']),
         type: 'primary',
@@ -505,6 +516,7 @@ const isShowMainButton1 = (row, val) => {
     } else if (val == 'supplierdeliver') { // 创建供应商发货申请
       supplierdeliverFormRef.value.openFormByCreate({
         number:row.number, //要货单号
+        deliNo:row.deliNo, //便次
         poNumber:row.poNumber, //采购订单号
         supplierCode:row.supplierCode, //供应商代码 
         endTime:row.endTime, //结束时间
@@ -984,6 +996,11 @@ const handleSelectionPublish = async ()=>{
     }
     getList() // 刷新当前列表
   }
+  const clearSearchInput = (field) => {
+    if (field == 'poNumber') {
+      tableData.value = []
+    }
+  }
 
   /** 初始化 **/
   onMounted(async () => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 2261ef305..eaabc1081 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -8,7 +8,7 @@ import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 import { getPurchaseDetailPagePoNumber } from '@/api/wms/purchaseDetail'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
-import { validatePositiveNumber0 } from "@/utils/validator";
+import { validatePositiveNumber0, validateInteger } from "@/utils/validator";
 const { t } = useI18n() // 国际化
 
 /**
@@ -17,7 +17,7 @@ const { t } = useI18n() // 国际化
 export const PurchasePlanMain = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '要货计划单号',
+      label: '单据号',
       field: 'number',
       sort: 'custom',
       isForm: false,
@@ -67,7 +67,7 @@ export const PurchasePlanMain = useCrudSchemas(
       sortTableDefault: 3,
       sortSearchDefault: 1,
       form: {
-        labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+        labelMessage: '影响明细中品番，需在供应商物料中维护',
         componentProps: {
           isEnter: true,
           enterSearch: true,
@@ -126,42 +126,22 @@ export const PurchasePlanMain = useCrudSchemas(
       isTable: true,
       isForm: false
     },
-    //仅是主列表页面的筛选搜索条件
     {
-      label: '送达日期',
-      field: 'deliveryDate',
-      sort: 'custom',
-      isDetail: false,
-      isTable: false,
-      isForm: false,
-      isTableForm: false,
-      isSearch: true,
-      sortSearchDefault: 3,
-      formatter: dateFormatter2,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          // type: 'datetimerange',
-          type: 'daterange',
-          defaultTime: [new Date('1 '), new Date('1 ')]
-        }
-      }
-    },
-    {
-      label: '采购订单',
+      label: '订单号',
       field: 'poNumber',
       sort: 'custom',
+      isSearch:true,
       sortSearchDefault: 11,
-      formatter: dateFormatter2,
+      sortTableDefault: 6,
+      //formatter: dateFormatter2,
       table: {
         width: 150
       },
-      isTable: false,
+      isTable: true,
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
-          disabled:true,
+          disabled: true,
           enterSearch: true,
           dialogWidth: '1085px', //搜索出来弹窗的宽度
           isSearchList: true,
@@ -208,87 +188,72 @@ export const PurchasePlanMain = useCrudSchemas(
     },
     {
       label: '送达日期',
+      sortTableDefault:5,
       field: 'deliveryDate',
-      table: {
-        width: 180
-      },
+      sort: 'custom',
+      isDetail: true,
+      isTable: true,
+      isForm: true,
+      isTableForm: false,
+      isSearch: true,
+      sortSearchDefault: 3,
       formatter: dateFormatter2,
-      sortTableDefault: 13,
-      form: {
+      search: {
         component: 'DatePicker',
         componentProps: {
-          type: 'date',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 '), new Date('1 ')]
         }
       },
-      detail: {
-        dateFormat: 'YYYY-MM-DD'
-      }
-    },
-    {
-      label: '采购订单类型',
-      field: 'type',
-      sort: 'custom',
-      sortTableDefault: 13,
-      dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
-      dictClass: 'string',
-      isTable: true,
-      isForm: true,
-      table: {
-        width: 150
-      },
       form: {
-        // labelMessage: '信息提示说明！！！',
+        component: 'DatePicker',
         componentProps: {
-          disabled: true
+          format: 'YYYY-MM-DD',
+          valueFormat: 'x',
+          defaultTime: [new Date('1 '), new Date('1 ')]
         }
-      }
-    },
-    {
-      label: '预测版本',
-      field: 'activeVersion',
-      isTable: true,
-      isForm: false,
-      sortTableDefault: 13,
-      table: {
-        width: 150
       },
-    },
-    {
-      label: '来源',
-      field: 'source',
-      sort: 'custom',
-      dictType: DICT_TYPE.PURCHASE_PLAN_SOURCE,
-      dictClass: 'string',
-      isTable: true,
-      isForm: false,
-      sortTableDefault: 13,
       table: {
         width: 150
       },
+      detail: {
+        dateFormat:'YYYY-MM-DD'
+      }
     },
     {
       label: '便次',
       field: 'deliNo',
       sort: 'custom',
-      isTable: true,
-      isForm: false,
-      sortTableDefault: 13,
+      sortTableDefault: 5,
       table: {
         width: 150
       },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 1,
+        },
+      }
     },
     {
-      label: '班次',
-      field: 'xxxxx',
+      label: '采购订单类型',
+      field: 'type',
       sort: 'custom',
-      isTable: true,
-      isForm: false,
-      sortTableDefault: 14,
+      sortTableDefault: 7,
+      dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: true,
       table: {
         width: 150
       },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          disabled: true
+        }
+      }
     },
     {
       label: '收货人',
@@ -297,6 +262,7 @@ export const PurchasePlanMain = useCrudSchemas(
       table: {
         width: 150
       },
+      sortTableDefault: 8,
       form: {
         componentProps: {
           disabled: false
@@ -310,6 +276,7 @@ export const PurchasePlanMain = useCrudSchemas(
       table: {
         width: 150
       },
+      sortTableDefault: 9,
       form: {
         componentProps: {
           disabled: false
@@ -324,78 +291,127 @@ export const PurchasePlanMain = useCrudSchemas(
         width: 150
       },
       isTable: false,
-      isForm: false
+      isForm: false,
     },
     {
-      label: '开始时间',
-      field: 'beginTime',
+      label: '仓库代码',
+      field: 'warehouseCode',
       sort: 'custom',
       table: {
         width: 150
       },
       isTable: false,
       isForm: false,
-      isDetail: false,
-      form: {
-        component: 'TimePicker',
-        componentProps: {
-          format: 'HH:mm'
-        }
-      }
     },
     {
-      label: '结束时间',
-      field: 'endTime',
+      label: '月台代码',
+      field: 'dockCode',
       sort: 'custom',
       table: {
         width: 150
       },
+      isForm: false,
       isTable: false,
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
       isForm: false,
-      isDetail: false,
+      isTable: false,
       form: {
-        component: 'TimePicker',
+        value: 'PurchaseReceipt',
         componentProps: {
-          format: 'HH:mm'
+          disabled: true
         }
-      }
+      },
     },
     {
-      label: '仓库代码',
-      field: 'warehouseCode',
+      label: '班次',
+      field: 'shift',
       sort: 'custom',
+      isTable: false,
+      isForm: false,
       table: {
         width: 150
       },
-      isTable: false,
-      isForm: false
     },
     {
-      label: '月台代码',
-      field: 'dockCode',
+      label: 'SPARC订单号',
+      field: 'orderCode',
       sort: 'custom',
+      isForm: false,
+      isTable: true,
+      table: {
+        width: 180,
+      },
+      sortSearchDefault: 4,
+      isSearch: true
+    },
+  
+
+ 
+    {
+      label: '预测版本',
+      field: 'activeVersion',
+      isTable: false,
+      isForm: false,
+      sortTableDefault: 13,
       table: {
         width: 150
       },
+    },
+    {
+      label: '来源',
+      field: 'source',
+      sort: 'custom',
+      dictType: DICT_TYPE.PURCHASE_PLAN_SOURCE,
+      dictClass: 'string',
+      isTable: false,
       isForm: false,
-      isTable: false
+      sortTableDefault: 13,
+      table: {
+        width: 150
+      },
     },
     {
-      label: '业务类型',
-      field: 'businessType',
+      label: '开始时间',
+      field: 'beginTime',
       sort: 'custom',
       table: {
         width: 150
       },
+      isTable: false,
       isForm: false,
+      isDetail: false,
+      form: {
+        component: 'TimePicker',
+        componentProps: {
+          format: 'HH:mm'
+        }
+      }
+    },
+    {
+      label: '结束时间',
+      field: 'endTime',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
       isTable: false,
+      isForm: false,
+      isDetail: false,
       form: {
-        value: 'PurchaseReceipt',
+        component: 'TimePicker',
         componentProps: {
-          disabled: true
+          format: 'HH:mm'
         }
       }
     },
+    
 
     // {
     //   label: '自动发布',
@@ -461,7 +477,8 @@ export const PurchasePlanMain = useCrudSchemas(
       field: 'creator',
       sort: 'custom',
       isForm: false,
-      isTable: false,
+      isTable: true,
+      sortTableDefault: 1000,
       table: {
         width: 150
       }
@@ -470,9 +487,9 @@ export const PurchasePlanMain = useCrudSchemas(
       label: '创建时间',
       field: 'createTime',
       isTable: true,
+      sortTableDefault: 1000,
       isForm: false,
       formatter: dateFormatter,
-      sortTableDefault: 15,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       },
@@ -499,39 +516,39 @@ export const PurchasePlanMain = useCrudSchemas(
         }
       }
     },
-    {
-      label: '最后更新者',
-      field: 'updater',
-      sort: 'custom',
-      isForm: false,
-      isTable: false,
-      table: {
-        width: 150
-      }
-    },
-    {
-      label: '最后更新时间',
-      field: 'updateTime',
-      isTable: false,
-      isForm: false,
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
-        }
-      }
-    },
+    // {
+    //   label: '最后更新者',
+    //   field: 'updater',
+    //   sort: 'custom',
+    //   isForm: false,
+    //   isTable: false,
+    //   table: {
+    //     width: 150
+    //   }
+    // },
+    // {
+    //   label: '最后更新时间',
+    //   field: 'updateTime',
+    //   isTable: false,
+    //   isForm: false,
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       style: { width: '100%' },
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x'
+    //     }
+    //   }
+    // },
     {
       label: '备注',
       field: 'remark',
@@ -541,7 +558,7 @@ export const PurchasePlanMain = useCrudSchemas(
       },
       isTable: false,
       isForm: false,
-      isDetail: true
+      isDetail: false
     },
     {
       label: '操作',
@@ -565,7 +582,11 @@ export const PurchasePlanMainRules = reactive({
   status: [{ required: true, message: '请选择状态', trigger: 'change' }],
   number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
   businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
-  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  deliNo: [
+    { required: true, message: '请输入便次', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的正整数', trigger: ['change', 'blur'] },
+  ],
 })
 
 /**
@@ -573,64 +594,76 @@ export const PurchasePlanMainRules = reactive({
  */
 export const PurchasePlanDetail = useCrudSchemas(
   reactive<CrudSchema[]>([
+    // {
+    //   label: '要货计划单号',
+    //   field: 'number',
+    //   sort: 'custom',
+    //   isTableForm: false,
+    //   hiddenInMain: true,
+    //   table: {
+    //     width: 180
+    //   },
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '采购订单号',
+    //   field: 'poNumber',
+    //   isSearch: true,
+    //   isTable: true,
+    //   sortTableDefault: 11,
+    //   sortSearchDefault: 11,
+    //   isForm: false,
+    //   isTableForm: false,
+    //   table: {
+    //     width: 150
+    //   },
+    //   search: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       dialogWidth: '1085px', //搜索出来弹窗的宽度
+    //       isSearchList: true,
+    //       enterSearch: true,
+    //       searchListPlaceholder: '请选择采购订单',
+    //       searchField: 'number',
+    //       searchTitle: '采购订单信息',
+    //       searchAllSchemas: PurchaseMain.allSchemas,
+    //       searchPage: PurchaseMainApi.getPurchaseMainPage,
+    //       searchCondition: [
+    //         {
+    //           key: 'available',
+    //           value: 'TRUE',
+    //           isMainValue: false
+    //         },
+    //         {
+    //           key: 'supplierCode',
+    //           value: 'supplierCode',
+    //           message: '请填写供应商代码！',
+    //           isMainValue: true
+    //         },
+    //         {
+    //           key: 'status',
+    //           value: 2,
+    //           isMainValue: false
+    //         }
+    //       ]
+    //     }
+    //   }
+    // },
     {
-      label: '要货计划单号',
-      field: 'number',
-      sort: 'custom',
-      isTableForm: false,
-      hiddenInMain: true,
-      table: {
-        width: 180
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '采购订单号',
-      field: 'poNumber',
-      isSearch: true,
-      isTable: true,
-      sortTableDefault: 11,
-      sortSearchDefault: 11,
-      isForm: false,
-      isTableForm: false,
+      label: '便次',
+      field: 'deliNo',
       table: {
         width: 150
       },
-      search: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          dialogWidth: '1085px', //搜索出来弹窗的宽度
-          isSearchList: true,
-          enterSearch: true,
-          searchListPlaceholder: '请选择采购订单',
-          searchField: 'number',
-          searchTitle: '采购订单信息',
-          searchAllSchemas: PurchaseMain.allSchemas,
-          searchPage: PurchaseMainApi.getPurchaseMainPage,
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'supplierCode',
-              value: 'supplierCode',
-              message: '请填写供应商代码！',
-              isMainValue: true
-            },
-            {
-              key: 'status',
-              value: 2,
-              isMainValue: false
-            }
-          ]
-        }
-      }
+      sortTableDefault: 3,
+      isTableForm: false,
+      isForm: false,
+      isTable: true,
+      isDetail:false
     },
     {
       label: '订单行',
@@ -639,7 +672,7 @@ export const PurchasePlanDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      sortTableDefault: 12,
+      sortTableDefault: 16,
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
@@ -696,8 +729,8 @@ export const PurchasePlanDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      sortTableDefault: 5,
       sortSearchDefault: 5,
+      sortTableDefault: 17,
       isSearch: true,
       form: {
         componentProps: {
@@ -713,7 +746,7 @@ export const PurchasePlanDetail = useCrudSchemas(
           multiple: true,
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -735,30 +768,48 @@ export const PurchasePlanDetail = useCrudSchemas(
       }
     },
     {
-      label: '物料状态',
-      field: 'itemStatus',
-      sort: 'custom',
-      dictType: DICT_TYPE.ITEM_STATUS,
-      dictClass: 'string',
+      label: '品名',
+      field: 'itemName',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 18,
+      isTableForm: false,
+      isForm: false,
       isTable: true,
-      sortTableDefault: 10,
-      sortSearchDefault: 10,
+      isDetail:false
+    },
+    {
+      label: '背番',
+      field: 'backNumber',
+      sort: 'custom',
+      isSearch: true,
+      hiddenSearchHigh:true,
       table: {
         width: 150
       },
+      isTable: true,
+      sortSearchDefault: 10,
+      sortTableDefault: 19,
       form: {
         componentProps: {
           disabled: true
         }
       },
       tableForm: {
-        type: 'Select',
         disabled: true
       }
     },
     {
-      label: '默认收货库区',
-      field: 'defaultAreaCode',
+      label: '物料状态',
+      field: 'itemStatus',
+      sort: 'custom',
+      dictType: DICT_TYPE.ITEM_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sortSearchDefault: 10,
+      sortTableDefault: 19,
+      hiddenInMain: true,
       table: {
         width: 150
       },
@@ -768,16 +819,13 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       },
       tableForm: {
+        type: 'Select',
         disabled: true
-      },
-      sortTableDefault: 7,
-      isTableForm: true,
-      isForm: true,
-      isTable: true
+      }
     },
     {
-      label: '库区描述',
-      field: 'areaDescription',
+      label: '默认收货库区',
+      field: 'defaultAreaCode',
       table: {
         width: 150
       },
@@ -791,18 +839,21 @@ export const PurchasePlanDetail = useCrudSchemas(
       },
       isTableForm: true,
       isForm: true,
-      isTable: false
+      isTable: true,
+      hiddenInMain: true,
+      sortTableDefault: 1000,
     },
     {
       label: '受入号',
       field: 'receivedNumber',
       sort: 'custom',
-      sortTableDefault: 7,
       sortSearchDefault: 7,
+      sortTableDefault: 20,
       table: {
         width: 150
       },
       isTableForm: true,
+      hiddenInMain: true,
       isForm: true,
       form: {
         componentProps: {
@@ -810,16 +861,17 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       },
       tableForm: {
-        type: 'Select',
-        disabled: true
+        // type: 'Select',
+        disabled: true,
+        isPlaceholder:false
       }
     },
     {
       label: '订单数量',
       field: 'orderQty',
       sort: 'custom',
-      sortTableDefault: 8,
       sortSearchDefault: 8,
+      sortTableDefault:23,
       table: {
         width: 150
       },
@@ -833,11 +885,11 @@ export const PurchasePlanDetail = useCrudSchemas(
       }
     },
     {
-      label: '计划数量',
+      label: '计划采购数量',
       field: 'planQty',
       sort: 'custom',
-      sortTableDefault: 9,
       sortSearchDefault: 9,
+      sortTableDefault: 21,
       table: {
         width: 150
       },
@@ -854,37 +906,32 @@ export const PurchasePlanDetail = useCrudSchemas(
       }
     },
     {
-      label: '已发货数量',
-      field: 'shippedQty',
+      label: '采购标包数量',
+      field: 'purchaseStdQty',
       sort: 'custom',
+      sortSearchDefault: 8,
+      sortTableDefault:24,
+      isForm: false,
+      isSearch: false,
+      isTableForm: true,
       table: {
         width: 150
       },
-      isTableForm: false,
-      isForm: false,
-      isTable: true,
+      tableForm: {
+        disabled:true
+      }
     },
-    // {
-    //   label: '在途数量',
-    //   field: 'notReceiveQty',
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //   isTableForm: false,
-    //   sortTableDefault: 7,
-    //   isForm: false,
-    //   isTable: true,
-    // },
     {
-      label: '计量单位',
+      label: '计划采购计量单位',
       field: 'uom',
       sort: 'custom',
       dictType: DICT_TYPE.UOM,
       dictClass: 'string',
-      isTable: true,
-      sortTableDefault: 10,
+      isTable: false,
+      isTableForm: false,
       sortSearchDefault: 10,
+      sortTableDefault:22,
+      hiddenInMain: true,
       table: {
         width: 150
       },
@@ -898,93 +945,186 @@ export const PurchasePlanDetail = useCrudSchemas(
         disabled: true
       }
     },
-
-    
+   
     {
-      label: '已收货数量',
-      field: 'receivedQty',
+      label: '采购计量单位',
+      field: 'purchaseStdUom',
+      dictType: DICT_TYPE.UOM,
       sort: 'custom',
+      sortSearchDefault: 9,
+      sortTableDefault:25,
+      isForm: false,
+      isSearch: false,
+      isTableForm: true,
       table: {
         width: 150
       },
-
-      isTableForm: false,
-      isForm: false,
-      isTable: false,
-      sortTableDefault: 6
+      tableForm: {
+        disabled: true
+      }
     },
     {
-      label: '是否可用',
-      field: 'available',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string',
-      isTable: true,
-      isTableForm: false,
-      isForm: false,
-      hiddenInMain: true,
+      label: '转换率',
+      field: 'convertRate',
       sort: 'custom',
+      sortSearchDefault: 9,
+      sortTableDefault: 26,
+      isForm: false,
+      isSearch: false,
       table: {
         width: 150
       },
       tableForm: {
-        type: 'Select',
-        inactiveValue: 'FALSE',
         disabled: true
-      },
-      form: {
-        component: 'Switch',
-        value: 'TRUE',
-        componentProps: {
-          inactiveValue: 'FALSE',
-          activeValue: 'TRUE'
-        }
       }
     },
     {
-      label: '最后更新者',
-      field: 'updater',
+      label: '已发采购数量',
+      field: 'shippedQty',
       sort: 'custom',
-      isTableForm: false,
-      hiddenInMain: true,
       table: {
         width: 150
       },
-      isForm: false
+      isTableForm: false,
+      isForm: false,
+      isTable: true,
+      hiddenInMain: true,
     },
     {
-      label: '最后更新时间',
-      field: 'updateTime',
+      label: '已收采购数量',
+      field: 'receivedQty',
       sort: 'custom',
-      isTableForm: false,
-      hiddenInMain: true,
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
       table: {
-        width: 180
+        width: 150
       },
+      isTableForm: false,
       isForm: false,
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
-        }
-      }
+      isTable: true,
     },
+
+
+    // {需求作废
+    //   label: '受入地',
+    //   field: 'receivedLocation',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+
+    //   isTableForm: false,
+    //   isForm: false,
+    //   isTable: true,
+    //   hiddenInMain: true,
+    // },
+   
     {
-      label: '备注',
-      field: 'remark',
-      sort: 'custom',
-      hiddenInMain: true,
-      isTableForm: false,
+      label: '库区描述',
+      field: 'areaDescription',
       table: {
         width: 150
-      }
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      },
+      isTableForm: false,
+      isForm: true,
+      isTable: false,
+      hiddenInMain: true,
     },
+ 
+   
+   
+    // {
+    //   label: '在途数量',
+    //   field: 'notReceiveQty',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTableForm: false,
+    //   sortTableDefault: 7,
+    //   isForm: false,
+    //   isTable: true,
+    // },
+   
+
+    // {
+    //   label: '是否可用',
+    //   field: 'available',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   isTableForm: false,
+    //   isForm: false,
+    //   hiddenInMain: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   tableForm: {
+    //     type: 'Select',
+    //     inactiveValue: 'FALSE',
+    //     disabled: true
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '最后更新者',
+    //   field: 'updater',
+    //   sort: 'custom',
+    //   isTableForm: false,
+    //   hiddenInMain: true,
+    //   table: {
+    //     width: 150
+    //   },
+    //   isForm: false
+    // },
+    // {
+    //   label: '最后更新时间',
+    //   field: 'updateTime',
+    //   sort: 'custom',
+    //   isTableForm: false,
+    //   hiddenInMain: true,
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   table: {
+    //     width: 180
+    //   },
+    //   isForm: false,
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       style: { width: '100%' },
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x'
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   hiddenInMain: true,
+    //   isTableForm: false,
+    //   table: {
+    //     width: 150
+    //   }
+    // },
     {
       label: '操作',
       field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
index 5a2caeecc..61600e670 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
@@ -31,7 +31,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -40,7 +40,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -48,7 +48,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -56,7 +56,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -253,7 +253,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '供应商物料代码',
+    label: '供应商品番',
     field: 'supplierItemCode',
     sort: 'custom',
     table: {
@@ -349,7 +349,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '客户物料代码',
+    label: '客户品番',
     field: 'customerItemCode',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index ab2006ea6..5e6be66af 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -22,7 +22,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isForm:false,
@@ -147,7 +147,7 @@ export const SupplierdeliverInspectionDetailRules = reactive({
     { required: true, message: '请上传文件', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   uom: [
     { required: true, message: '请输入计量单位', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index 64c8ef6a9..22d7869cc 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -64,6 +64,7 @@
   <!-- 详情 -->
   <Detail
     ref="detailRef"
+    :isShowPackNumber="true"
     :annexTable="[
       {
         label: '质检明细',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index 91c16dbe6..003e15373 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -16,8 +16,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '申请单号',
-    field: 'requestNumber',
+    label: '发货单号',
+    field: 'asnNumber',
     sort: 'custom',
     table: {
       width: 180
@@ -33,13 +33,29 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '发货单号',
-    field: 'asnNumber',
+    label: '便次',
+    field: 'deliNo',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        disabled: true
+      },
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     table: {
       width: 180
     },
-    isSearch: true
+    isSearch: true,
+    isTable:false
   },
   {
     label: '供应商代码',
@@ -50,6 +66,15 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
   {
     label: '联系人姓名',
     field: 'contactName',
@@ -57,6 +82,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '联系人电话',
@@ -65,6 +91,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '联系人电子邮件',
@@ -73,6 +100,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从仓库代码',
@@ -81,6 +109,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到仓库代码',
@@ -89,6 +118,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到月台代码',
@@ -97,6 +127,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '时间窗口',
@@ -105,6 +136,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '计划到货时间',
@@ -133,6 +165,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '运输方式',
@@ -142,6 +175,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '车牌号',
@@ -150,6 +184,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -158,6 +193,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '入库事务类型',
@@ -166,6 +203,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '执行时间',
@@ -186,6 +225,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
+    isDetail:false
   },
   {
     label: '生效日期',
@@ -207,6 +248,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -227,6 +269,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '截止时间',
@@ -247,6 +291,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '部门',
@@ -255,17 +301,20 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
     },
+    isDetail: false
   },
   {
     label: '业务类型',
@@ -274,6 +323,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '备注',
@@ -282,6 +333,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '创建时间',
@@ -311,6 +364,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault: 1000,
+    isTable: false,
   },
   {
     label: '创建者',
@@ -319,6 +374,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
+    isTable: false,
   },
   {
     label: '是否可用',
@@ -330,6 +387,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isDetail: false,
   },
   {
     label: '操作',
@@ -403,9 +461,10 @@ export const SupplierdeliverRecordMainRules = reactive({
  */
 export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -427,37 +486,34 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '订单数量',
-    field: 'orderQty',
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled: true,
-        min: 0,
-        precision: 6
-      }
+  },
+  {
+    label: '品名',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
     },
-    tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '背番',
+    field: 'backNumber',
     sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
     table: {
       width: 150
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '供应商发货数量',
+    field: 'supplierQty',
     sort: 'custom',
     table: {
       width: 150
@@ -467,8 +523,19 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '供应商发货计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -478,8 +545,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
+    label: '库存计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -488,9 +556,8 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '包装名称',
-    field: 'packName',
-    dictClass: 'string',
+    label: '转换率',
+    field: 'convertRate',
     isTable: true,
     sort: 'custom',
     table: {
@@ -498,23 +565,39 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '供应商计量数量',
-    field: 'supplierQty',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable:false,
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'toBatch',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'toBatch',
+    sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -533,7 +616,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -554,7 +637,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -575,196 +658,124 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
   },
-  
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '从库位组代码',
-    field: 'fromLocationGroupCode',
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '从库区代码',
-    field: 'fromAreaCode',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
   {
-    label: '到库区代码',
-    field: 'toAreaCode',
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '从库区代码',
+    field: 'fromAreaCode',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
- 
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '到库区代码',
+    field: 'toAreaCode',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
+
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    hiddenInMain:true,
-    table: {
-      width: 180
-    },
-  },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    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',
-      }
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  // {
-  //   label: '最后操作时间',
-  //   field: 'updateTime',
-  //   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',
-  //     }
-  //   },
-  // },
-  // {
-  //   label: '最后操作人',
-  //   field: 'updater',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+ 
   {
     label: '操作',
     hiddenInMain:true,
@@ -827,7 +838,7 @@ export const SupplierdeliverRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   createTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
@@ -912,7 +923,7 @@ export const SupplierdeliverRecordDetailPickingNumer = useCrudSchemas(reactive<C
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1221,7 +1232,7 @@ export const SupplierdeliverRecordDetailPickingNumer = useCrudSchemas(reactive<C
   },
  
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1237,7 +1248,7 @@ export const SupplierdeliverRecordDetailPickingNumer = useCrudSchemas(reactive<C
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1253,7 +1264,7 @@ export const SupplierdeliverRecordDetailPickingNumer = useCrudSchemas(reactive<C
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 262e565a1..6c0084ce3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -123,7 +123,11 @@
     :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
     :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
+  >
+    <template #isPutaway="{ row }">
+     <el-tag type="primary">{{row.isPutaway ==1 ?'是':'否'}}</el-tag>
+    </template>
+  </Detail>
 
   <!-- 导入 -->
   <ImportForm
@@ -218,7 +222,9 @@ import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
 import labelForm from './labelForm.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import Decimal from "decimal.js"  // 具体文件中引入
 const { loadStart, loadDone } = usePageLoading()
+import { cloneDeep } from 'lodash-es'
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
 
@@ -681,6 +687,7 @@ const buttonTableClick = async (val, row) => {
               // await getDetailList()
               count.value++
               await getGenerateLabelList(row)
+
               formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
             }
           })
@@ -719,36 +726,44 @@ const getGenerateLabelList = async (row) => {
       item.boxPackaging = item.boxPackaging ? item.boxPackaging : []
       item.packUnitInitOptions = item.boxPackaging
       item.secondPackUnitInitOptions = item.palletPackaging || []
-      let obj = item?.boxPackaging[0]
-      if (obj) {
-        item.packUnit = obj.packUnit
-        item.packQty = obj.packQty
-        if (!item.packQty) {
-          // 如果没有数量可以输入
-          SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
-            if (item.field == 'packQty') {
-              item.tableForm.disabled = false
-            }
-          })
-        } else {
-          // 有数量不可以输入
-           SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
-            if (item.field == 'packQty') {
-              item.tableForm.disabled = true
-            }
-          })
-        }
+     
+      // let obj = item?.boxPackaging[0]
+      // if (obj) {
+      //   item.packUnit = obj.packUnit
+      //   item.packQty = obj.packQty
+      //   if (!item.packQty) {
+      //     // 如果没有数量可以输入
+      //     SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+      //       if (item.field == 'packQty') {
+      //         item.tableForm.disabled = false
+      //       }
+      //     })
+      //   } else {
+      //     // 有数量不可以输入
+      //      SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+      //       if (item.field == 'packQty') {
+      //         item.tableForm.disabled = true
+      //       }
+      //     })
+      //   }
+      // } else {
+      //   item.packUnit = ''
+      //   item.packQty = ''
+      // }
+       if (item.convertRate==0 || item.convertRate == 1) {
+        item.balanceQty = item.qty
+        item.purchaseStdQty = item.packQty
       } else {
-        item.packUnit = ''
-        item.packQty = ''
+        item.balanceQty = parseFloat(Decimal(item.qty).mul(Decimal(item.convertRate)).toNumber().toFixed(5))
+        item.purchaseStdQty = parseFloat(Decimal(parseFloat(item.packQty)).div(Decimal(parseFloat(item.convertRate))).toNumber())
       }
-      // 有托规格显示托规格，没有显示第一条规格
-      item.secondPackUnit = obj?.parentPackUnit
-        ? obj.parentPackUnit
-        : item?.secondPackUnitInitOptions[0]?.packUnit
-      item.secondPackQty = obj?.parentPackUnit
-        ? obj.parentPackQty
-        : item?.secondPackUnitInitOptions[0]?.packQty
+      // // 有托规格显示托规格，没有显示第一条规格
+      // item.secondPackUnit = obj?.parentPackUnit
+      //   ? obj.parentPackUnit
+      //   : item?.secondPackUnitInitOptions[0]?.packUnit
+      // item.secondPackQty = obj?.parentPackUnit
+      //   ? obj.parentPackQty
+      //   : item?.secondPackUnitInitOptions[0]?.packQty
     })
   })
 }
@@ -778,7 +793,7 @@ const footButtonClick = async (val) => {
       message.warning('托的包装数量要大于箱的包装数量,请修改')
       return
     }
-    const data = JSON.parse(JSON.stringify(detatableData1.value))
+    const data = cloneDeep(detatableData1.value)
     labelFormRef.value.openLabel(data)
   } else if (val == 'close') {
     formLabelRef.value.dialogVisible = false
@@ -805,6 +820,11 @@ const formSelectChangeLabel = (field, val, row) => {
           }
         })
       }
+      if (row.convertRate ==0  || row.convertRate == 1) {
+        row.purchaseStdQty = row.packQty
+      } else {
+        row.purchaseStdQty = parseFloat(Decimal(parseFloat(row.packQty)).div(Decimal(parseFloat(row.convertRate))).toNumber().toFixed(5))
+      }
       // 获取托规格
       const params1 = {
         itemCode: row.itemCode,
@@ -845,7 +865,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     .get(CACHE_KEY.DEPT)
     .find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-  annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示
+  annexInspectionDetail.value.hiddenDelete = row.status == 8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示
   detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain')
 }
 /** 上传履历表 */
@@ -1164,6 +1184,7 @@ const submitFormLabel = async (list) => {
     const data = {
       subList: list
     }
+    console.log(33,data)
     await message.confirm(t('ts.是否为此数据生成标签？'))
     labelFormRef.value.isLoading = true
     await SupplierdeliverRequestMainApi.genLabel(data)
@@ -1187,6 +1208,7 @@ const clearInput = async (field, row, index) => {
 
 const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/1022297965884559360?token=' + getAccessToken())
+const src1 = ref(BASE_URL + '/jmreport/view/1028150465710329856?token=' + getAccessToken())
 getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
 
 // 标签打印
@@ -1201,7 +1223,7 @@ const labelPrint = async (row) => {
 
   // 获得表格的各种操作
   const { getList: getListPrint } = tableMethods
-  getListPrint()
+  await getListPrint()
   tableObject.loading = false
   const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
@@ -1212,7 +1234,6 @@ const labelPrint = async (row) => {
 
 // 打印全部
 const printAllClick = () => {}
-
 // 批量打印--供应商发货申请
 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
   // let rows:any = []
@@ -1223,15 +1244,23 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     message.warning(t('ts.请先选择要打印的数据'))
     return
   }
-  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-
-  await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(','))
-    .then((res) => {
-      window.open(src.value + '&asn_number=' + res)
-    })
-    .catch((err) => {
-      message.error(t('ts.创建标签失败'))
-    })
+  let array1 = []
+  val.forEach((item,index) => {
+      array1.push(item)
+  })
+  await PackageApi.batchPrintingLablesForYT(array1)
+      .then(res => {
+     if(res.xdpLabel){
+      //协定品标签
+      window.open(src1.value + '&asn_number=' + res.xdpLabel) 
+    }
+    if (res.cgLabel) {
+      //采购标签
+      window.open(src.value + '&asn_number=' + res.cgLabel) 
+    }
+  }).catch(err => {
+    message.error(t('ts.创建标签失败'))
+  })
 }
 
 const print = async () => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index f2b7a16f7..be4803770 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -152,17 +152,18 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
+      <el-table-column label="品番" width="150" prop="itemCode" align="center" />
+      <el-table-column label="背番" width="150" prop="backNumber" align="center" />
       <el-table-column label="批次" width="150" prop="batch" align="center" />
-      <el-table-column label="数量" width="150" prop="qty" align="center" />
-      <el-table-column label="计量单位" width="150" prop="uom" align="center">
+      <el-table-column label="库存数量" width="150" prop="balanceQty" align="center" />
+      <el-table-column label="库存计量单位" width="150" prop="uom" align="center">
         <template #default="scope"> {{ uomLabel(scope.row) }}</template>
       </el-table-column>
       <!-- <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
       <el-table-column label="托规格" width="100" prop="secondPackUnit" align="center" />
       <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" /> -->
-      <el-table-column label="箱规格" width="200" prop="packUnit" align="center" />
-      <el-table-column label="箱数量" width="200" prop="packQty" align="center" />
+      <el-table-column label="包装规格" width="200" prop="packUnit" align="center" />
+      <el-table-column label="库存标包数量" width="200" prop="packQty" align="center" />
     </el-table>
     <el-pagination
       v-show="tableData.length > 10"
@@ -230,9 +231,9 @@ const expandChange = (row: any, expandedRows: any[]) => {
   // 判断托信息和箱信息是否都存在
   if (row.secondPackUnit && row.secondPackQty && row.packUnit && row.packQty) {
     // 总共需要多少箱
-    row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.allXiangQty = Math.ceil(parseFloat(row.balanceQty) / parseFloat(row.packQty))
     // 放满的多少箱
-    row.manXiangQty = Math.floor(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.manXiangQty = Math.floor(parseFloat(row.balanceQty) / parseFloat(row.packQty))
     // 托数量/箱数量  一托可以放几箱
     row.otherNumber = Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
     // 数量%托数量  获取总共几托
@@ -245,9 +246,9 @@ const expandChange = (row: any, expandedRows: any[]) => {
     console.log(11, row.tuoInManNumber)
     // 数量除以托数量获取余数
     row.lastNumber =
-      parseFloat(row.qty) >= parseFloat(row.tuoInManNumber)
-        ? accuracyFun.subtract(parseFloat(row.qty), parseFloat(row.tuoInManNumber))
-        : parseFloat(row.qty)
+      parseFloat(row.balanceQty) >= parseFloat(row.tuoInManNumber)
+        ? accuracyFun.subtract(parseFloat(row.balanceQty), parseFloat(row.tuoInManNumber))
+        : parseFloat(row.balanceQty)
     // 循环托
     row.packageList = []
     for (let i = 0; i < row.allTuoQty; i++) {
@@ -314,7 +315,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
   // 只有箱规格
   if (!row.secondPackUnit && row.packUnit && row.packQty) {
     // 数量%每箱数量  获取总共几箱
-    row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.allXiangQty = Math.ceil(parseFloat(row.balanceQty) / parseFloat(row.packQty))
     row.packageList = []
     row.allTuoQty = ''
     row.allTuoQty1 = 1
@@ -325,7 +326,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
       row.packageList[i] = {
         id: oneId.value,
         // xPoNumber: i + 1,
-        qtyOne: row.qty,
+        qtyOne: row.balanceQty,
         isTuo: 0 //无托
       }
     }
@@ -338,7 +339,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
           // xPoNumber: j + 1
         }
         // 数量除以箱数量获取余数
-        cur.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
+        cur.lastNumber = parseFloat(row.balanceQty) % parseFloat(row.packQty)
         // 如果有余数
         if (cur.lastNumber) {
           // 最后一条信息直接展示余数的信息
@@ -407,16 +408,14 @@ const submitForm = () => {
         )
         // item.allNumber += parseFloat(cur.qtyOne) || 0
       })
-      console.log(111, item.allNumber)
-      console.log(222, parseFloat(item.qty))
-      return item.allNumber != parseFloat(item.qty)
+      return item.allNumber != parseFloat(item.balanceQty)
     })
     console.log(222, obj)
     // return
     // const isBol = arr.some((item) => item == false)
     if (obj) {
       message.warning(
-        `物料【${obj.itemCode}】,批次【${obj.batch}】,${obj.packageList.length}托的总和数量【${obj.allNumber}】不等于发货总数量【${obj.qty}】`
+        `物料【${obj.itemCode}】,批次【${obj.batch}】,${obj.packageList.length}托的总和数量【${obj.allNumber}】不等于发货总数量【${obj.balanceQty}】`
       )
       return
     }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 25801304a..fe656f047 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -18,6 +18,7 @@
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"
+    :isShowReduceButton="false"
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
@@ -108,6 +109,7 @@ const openFormByCreate = async ( data ) => {
     setV['supplierCode'] = data['supplierCode'] // 供应商代码
     setV['poNumber'] = data['poNumber'] //采购订单
     setV['ppNumber'] = data['number'] // 要货单号
+    setV['deliNo'] = data['deliNo'] // 要货单号
     searchPage: SupplierApi.getSupplierPage
     //新增--选择完要货计划，自动展示明细
     getSearchTableData(data['number'],'ppNumber','number',0)
@@ -253,6 +255,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         //新增--选择完要货计划，自动展示明细
         
         setV['poNumber'] = val[0]['poNumber'] //采购订单
+        setV['deliNo'] = val[0]['deliNo']
         getSearchTableData(val[0]['number'],formField,searchField,0)
 
         // 设置计划到货时间
@@ -430,7 +433,7 @@ const submitForm = async (formType, submitData) => {
         }
       }
       if(data.subList.length == 0){
-        message.error(t('ts.子列表数量不能空'))
+        message.error(t('子列表发货数量不能空'))
         return
       }
       formRef.value.formLoading = true
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index ad3c3c283..9a42d5edf 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -13,6 +13,14 @@ import { cloneDeep } from 'lodash-es'
 import {validateInteger} from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
+const valueFilter = [{
+  label: '是',
+  value:'1'
+}, {
+  label: '否',
+    value: '0'
+  }]
+     
 
 let PurchasePlanDetailSchemas = cloneDeep(PurchasePlanDetail.allSchemas)
 if(PurchasePlanDetailSchemas?.tableColumns){
@@ -26,6 +34,15 @@ if(PurchasePlanDetailSchemas?.tableColumns){
     formatter: dateFormatter2,
     sortTableDefault:2
   });
+  PurchasePlanDetailSchemas.tableColumns.splice(1, 0, {
+    label: '要货计划单号',
+    field: 'number',
+    table: {
+      width: 230
+    },
+    width: 230,
+    sortTableDefault:1
+  });
 }
 
 
@@ -52,6 +69,20 @@ import { tr } from 'element-plus/es/locale'
  * @returns {Array} 供应商发货申请主表
  */
 export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm:false,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    detail: {
+      sortDetailDefault:1,
+    },
+    isSearch: true
+  },
   {
     label: '发货单号',
     field: 'asnNumber',
@@ -60,20 +91,35 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 180,
       fixed: 'left'
     },
+    detail: {
+      sortDetailDefault:1,
+    },
     isSearch: true,
     isForm: false
   },
+ 
   {
-    label: '单据号',
-    field: 'number',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: false,
+    isSearch: false,
     sort: 'custom',
     table: {
-      width: 180,
-      fixed: 'left'
+      width: 150
     },
-    isTable:false,
-    isForm: false,
-    isSearch: true,
+    sortTableDefault: 2,
+    detail: {
+      sortDetailDefault: 2,
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '供应商代码',
@@ -82,8 +128,13 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable:false,
+    isTable: true,
     isSearch: true,
+
+    sortTableDefault: 5,
+    detail: {
+      sortDetailDefault:5,
+    },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -106,7 +157,21 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isTable: true,
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isDetail:false,
+    detail: {
+      sortDetailDefault: 6,
+    }
+  },
   {
     label: '要货计划单号',
     field: 'ppNumber',
@@ -115,7 +180,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:9,
+    // sortTableDefault:9,
+    sortTableDefault: 4,
     form: {
       // labelMessage: '信息提示说明！！！', 
       componentProps: {
@@ -158,12 +224,16 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
           isFormModel: true
         }], // 失去焦点校验参数
       }
+    },
+    detail: {
+      sortDetailDefault: 4,
     }
   },
   {
     label: '要求到货时间',
     field: 'arriveTime',
     formatter: dateFormatter,
+    isDetail:false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -184,7 +254,26 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '采购订单',
+    label: '便次',
+    field: 'deliNo',
+    sort: 'custom',
+    sortTableDefault: 4,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        disabled: true
+      },
+    },
+    detail: {
+      sortDetailDefault: 4,
+    }
+  },
+  {
+    label: '订单号',
     field: 'poNumber',
     isForm:true,
     isTable:false,
@@ -196,32 +285,19 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+
   {
-    label: '计划到货时间',
-    field: 'planArriveTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '联系人姓名',
+    field: 'contactName',
     sort: 'custom',
+    isTable:false,
     table: {
-      width: 180
-    },
-    isTable:true,
-    sortTableDefault:6,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
   },
   {
-    label: '发货联系人姓名',
-    field: 'contactName',
+    label: '联系人电话',
+    field: 'contactPhone',
     sort: 'custom',
     isTable:false,
     table: {
@@ -229,24 +305,16 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '发货联系人电话',
-    field: 'contactPhone',
+    label: '联系人电子邮件',
+    field: 'contactEmail',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
+    isDetail:true,
     table: {
       width: 150
     },
   },
   // {
-  //   label: '联系人电子邮件',
-  //   field: 'contactEmail',
-  //   sort: 'custom',
-  //   isTable:false,
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
   //   label: '供应商发货仓库代码',
   //   field: 'fromWarehouseCode',
   //   sort: 'custom',
@@ -261,6 +329,16 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   },
   //   isForm: true
   // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -291,7 +369,29 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: false
   },
-  
+  {
+    label: '计划到货时间',
+    field: 'planArriveTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    // sortTableDefault:6,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '承运商',
     field: 'carrierCode',
@@ -320,20 +420,21 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  // {
-  //   label: '业务类型',
-  //   field: 'businessType',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     value: 'SupplierDeliver',
-  //     componentProps: {
-  //       disabled: true,
-  //     }
-  //   }
-  // },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'SupplierDeliver',
+      componentProps: {
+        disabled: true,
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -341,7 +442,30 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable: false
+    isTable: false,
+    isDetail: false
+  },
+  {
+    label: '是否上架',
+    field: 'isPutaway',
+    sort: 'custom',
+    dictClass: 'string',
+    isForm: false,
+    isTableForm: false,
+    isTable: false,
+    table: {
+      
+    },
+    detail: {
+      dictType: 'primary',
+      valueFilter: (value) => {
+        if (value == 1) {
+          return `是`
+        } else {
+          return '否'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
@@ -373,222 +497,238 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortSearchDefault: 1000,
+    sortTableDefault: 1000,
     isForm: false
   },
   {
     label: '创建者',
     field: 'creator',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
+    sortSearchDefault: 1000,
+    sortTableDefault: 1000,
     table: {
       width: 150
     },
     isForm: false
   },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detaul: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
   // {
-  //   label: '部门',
-  //   field: 'departmentCode',
+  //   label: '申请时间',
+  //   field: 'requestTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
   //   sort: 'custom',
+  //   isTable:false,
   //   table: {
-  //     width: 150
-  //   },
-  //   formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-  //     return userDeptArray.find((account) => account.id == cellValue)?.name
+  //     width: 180
   //   },
   //   form: {
-  //     value: userDept.id,
-  //     component: 'Select',
-  //     api: () => userDeptArray,
+  //     component: 'DatePicker',
   //     componentProps: {
-  //       disabled: true,
-  //       optionsAlias: {
-  //         labelField: 'name',
-  //         valueField: 'id'
-  //       }
+  //       style: { width: '100%' },
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
   //     }
-  //   }
+  //   },
+  //   isForm: false
+  // },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   formatter: dateFormatter,
+  //   detaul: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   isTable:false,
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width: '100%' },
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+  // {
+  //   label: '部门',
+  //   field: 'departmentCode',
+  //   sort: 'custom',
+  //   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: 'updateTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   isTable:false,
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width: '100%' },
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+  // {
+  //   label: '最后更新者',
+  //   field: 'updater',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   isForm: false
+  // },
+  // {
+  //   label: '自动提交',
+  //   field: 'autoCommit',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable:false,
+  //   sort: 'custom',
+  //   isForm:false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoCommit,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '自动通过',
+  //   field: 'autoAgree',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm:false,
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoAgree,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '自动执行',
+  //   field: 'autoExecute',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm:false,
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoExecute,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isForm: false,
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
   // },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
-    isSearch: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
+    label: '到货时间',
+    field: 'arriveTime',
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD hh:mm:ss'
     },
     sort: 'custom',
-    isTable:false,
+    hiddenInMain: true,
     table: {
       width: 180
     },
+    isForm: false,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
         style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false
-  },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable:false,
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm:false,
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm:false,
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
+
+    isTableForm: false,
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
     }
   },
   {
@@ -664,32 +804,91 @@ export const SupplierdeliverRequestMainRules = reactive({
  * @returns {Array} 供应商发货申请子表
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  
   {
-    label: '订单行',
-    field: 'poLine',
+    label: '订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    // sortTableDefault:10,
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        disabled: true,
+        // isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '要货计划信息',
+        searchAllSchemas: PurchasePlanDetail.allSchemas,
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'ppNumber',
+            message: '请填写要货计划单号！',
+            isMainValue: true
+          },
+          {
+            key: 'flag',
+            value: 1,
+            isMainValue: false
+          },
+          {
+            key: 'isAll',
+            value: '1',
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
       }
     },
     tableForm: {
-      disabled: true
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '要货计划信息',
+      searchAllSchemas: PurchasePlanDetail.allSchemas,
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'ppNumber',
+          message: '请填写要货计划单号！',
+          isMainValue: true
+        },
+        {
+          key: 'flag',
+          value: 1,
+          isMainValue: false
+        },
+        {
+          key: 'isAll',
+          value: '1',
+          isMainValue: false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
     }
   },
+  
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
-    isSearch:true,
     table: {
       width: 150
     },
-    sortTableDefault:3,
     form: {
       componentProps: {
         disabled: true
@@ -700,144 +899,138 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '申请发货数量',
-    field: 'qty',
+    label: '品番',
+    field: 'itemCode',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },
-    sortTableDefault:4,
+    // sortTableDefault:3,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 0,
-        precision: 6
+        disabled: true
       }
     },
     tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
+      disabled: true
     }
   },
   {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
+    label: '品名',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
     },
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '背番',
+    field: 'backNumber',
     sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
     table: {
-      width: 180
+      width: 150
     },
-    sortTableDefault:7,
     form: {
-      component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+        disabled: true
       }
     },
     tableForm: {
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
+      disabled: true
     }
   },
   {
-    label: '供应商批次',
-    field: 'supplierBatch',
+    label: '背番',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:8,
-    tableForm: {
-      disabled: false
-    }
+    hiddenInMain: true,
+    isTableForm: false,
+    isTable: false,
+    isForm: false
   },
   {
-    label: '发货批次',
-    field: 'batch',
+    label: '描述',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    tableForm: {
-      disabled: true
-    }
+    hiddenInMain: true,
+    isTableForm: false,
+    isTable: false,
+    isForm: false
   },
   {
-    label: '计划数量',
-    field: 'planQty',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable:false,
-    tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      precision: 6
+    hiddenInMain: true,
+    isTableForm: false,
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
     },
+    hiddenInMain: true,
+    isTableForm: false,
     form: {
       component: 'InputNumber',
       componentProps: {
+        disabled: true,
         min: 0,
         precision: 6
       }
-    }
-  },
-  {
-    label: '已发货数量',
-    field: 'shippedQty',
-    sort: 'custom',
-    table: {
-      width: 150
     },
     tableForm: {
       disabled: true,
       type: 'InputNumber',
+      min: 0,
       precision: 6
-    },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
     }
   },
-  
-  
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   isForm: false
-  // },
   {
-    label: '到货日期',
-    field: 'arriveDate',
+    label: '供应商批次',
+    field: 'supplierBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    // sortTableDefault:8,
+    hiddenInMain: true,
+    isTable: false,
+    tableForm: {
+      disabled: false
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
-    hiddenInMain:true,
     table: {
       width: 180
     },
-    isForm: false,
+    sortTableDefault:1000,
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -847,8 +1040,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
-    
-    isTableForm: false,
     tableForm: {
       type: 'FormDate',
       dateFormat: 'YYYY-MM-DD',
@@ -856,87 +1047,60 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '过期日期',
-    hiddenInMain:true,
-    field: 'expireDate',
-    formatter: dateFormatter2,
-    isTableForm:false, 
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
+      width: 150
     },
-    // tableForm: {
-    //   type: 'FormDate',
-    //   dateFormat: 'YYYY-MM-DD',
-    //   valueFormat: 'x',
-    // }
-    tableForm:{
-      type: 'slot',
+    tableForm: {
       disabled: true
     }
   },
-  // {
-  //   label: '发货数量',
-  //   field: 'qty',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   sortTableDefault:2,
-  //   form: {
-  //     component: 'InputNumber',
-  //     componentProps: {
-  //       min: 1,
-  //       precision: 6
-  //     }
-  //   },
-  //   tableForm: {
-  //     type: 'InputNumber',
-  //     min: 1,
-  //     precision: 6
-  //   }
-  // },
   {
-    label: '订单数量',
-    field: 'orderQty',
+    label: '发货数量',
+    field: 'qty',
+    sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isTableForm: false,
+    // sortTableDefault:4,
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled: true,
         min: 0,
-        precision: 6
+        precision: 6,
       }
     },
     tableForm: {
-      disabled: true,
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      precision: 6,
     }
   },
-  
   {
-    label: '供应商计量数量',
-    field: 'supplierPackQty',
+    label: '发货计量单位',
+    field: 'uom',
     sort: 'custom',
-    hiddenInMain:true,
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    // sortTableDefault:5,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    }
+  },
+
+
+  {
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
+    sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -944,37 +1108,37 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       component: 'InputNumber',
       componentProps: {
         min: 1,
-        precision: 6
+        precision: 5
       }
     },
-    isTableForm: false,
     isForm: false,
     tableForm: {
       type: 'InputNumber',
       min: 1,
-      precision: 6
+      precision: 5,
+      disabled: true,
     }
   },
   {
-    label: '供应商计量单位',
-    field: 'supplierPackUnit',
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    hiddenInMain:true,
+    hiddenInMain: true,
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
     isForm: false,
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true,
     }
   },
   {
     label: '转换率',
-    hiddenInMain:true,
+    hiddenInMain: true,
     field: 'convertRate',
     sort: 'custom',
     table: {
@@ -983,190 +1147,251 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0
+        min: 0,
+        disabled: true,
       }
     },
-    isTableForm: false,
     isForm: false,
     tableForm: {
       type: 'InputNumber',
-      min: 0
+      min: 0,
+      disabled:true,
     }
   },
   {
-    label: '单据号',
-    hiddenInMain:true,
-    field: 'number',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
-      width: 180
+      width: 150
     },
     isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isForm: false,
   },
-  
   {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+    label: '包装规格',
+    field: 'packUnit',
+    hiddenInMain: true,
     isTable: true,
-    sortTableDefault:5,
+    sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true,
-      type: 'Select'
-    }
+    isTableForm: false,
+    isForm: false,
   },
+ 
   {
-    label: '采购订单号',
-    field: 'poNumber',
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
     sort: 'custom',
+    hiddenInMain: true,
     table: {
-      width: 150
+      width: 180
     },
-    isSearch:true,
-    sortTableDefault:10,
+    isForm: false,
+    isTable:false,
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component: 'DatePicker',
       componentProps: {
-        disabled:true,
-        // isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '要货计划信息',
-        searchAllSchemas: PurchasePlanDetail.allSchemas,
-        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
-        searchCondition: [
-          {
-            key: 'number',
-            value: 'ppNumber',
-            message: '请填写要货计划单号！',
-            isMainValue: true
-          },
-          {
-            key: 'flag',
-            value: 1,
-            isMainValue: false
-          },
-          {
-            key: 'isAll',
-            value: '1',
-            isMainValue: false
-          },  
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-
-        ]
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     },
+
+    isTableForm: false,
     tableForm: {
-      disabled:true,
-      isInpuFocusShow: false,
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '要货计划信息',
-      searchAllSchemas: PurchasePlanDetail.allSchemas,
-      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
-      searchCondition: [
-        {
-          key: 'number',
-          value: 'ppNumber',
-          message: '请填写要货计划单号！',
-          isMainValue: true
-        },
-        {
-          key: 'flag',
-          value: 1,
-          isMainValue: false
-        },
-        {
-          key: 'isAll',
-          value: '1',
-          isMainValue: false
-        },  
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
     }
   },
+  
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '过期日期',
+    hiddenInMain: true,
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    isTableForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
+
+    sortTableDefault: 1000,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    // tableForm: {
+    //   type: 'FormDate',
+    //   dateFormat: 'YYYY-MM-DD',
+    //   valueFormat: 'x',
+    // }
+    tableForm: {
+      type: 'slot',
+      disabled: true
+    }
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '计划数量',
+    field: 'planQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
+    isTable:false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
   },
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '已发货数量',
+    field: 'shippedQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 6
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
   },
+  
+  
+  // {
+  //   label: '替代批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  
+  
+  // {
+  //   label: '发货数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:2,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 1,
+  //     precision: 6
+  //   }
+  // },
+ 
+  // {
+  //   label: '单据号',
+  //   hiddenInMain:true,
+  //   field: 'number',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTableForm: false,
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  
+
+
   {
-    label: '物料描述1',
-    field: 'itemDesc1',
+    label: '从货主代码',
+    field: 'fromOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
     hiddenInMain:true,
     isTableForm: false,
+    isTable: false,
     isForm: false
   },
   {
-    label: '物料描述2',
-    field: 'itemDesc2',
+    label: '到货主代码',
+    field: 'toOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
     hiddenInMain:true,
     isTableForm: false,
+    isTable: false,
     isForm: false
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '是否上架',
+    field: 'isPutaway',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+    //   return valueFilter.find((account) => account.value == cellValue)?.label
+    // },
     table: {
-      width: 150
+      width:150
     },
-    hiddenInMain:true,
+    sortTableDefault: 10000,
     isTableForm: false,
-    isForm: false
+    hiddenInMain: true,
+    
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '创建时间',
@@ -1175,7 +1400,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    hiddenInMain:false,
+    hiddenInMain: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -1191,6 +1417,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     isTableForm: false,
     isForm: false,
+    sortTableDefault:10000
   },
   {
     label: '创建者',
@@ -1199,9 +1426,10 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    hiddenInMain:false,
     isTableForm: false,
+    isTable: true,
     isForm: false,
+    sortTableDefault: 10000
   },
   // {
   //   label: '最后更新时间',
@@ -1250,12 +1478,12 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '操作',
-    hiddenInMain:true,
+    hiddenInMain: true,
     field: 'action',
     isDetail: false,
     isForm: false,
     table: {
-      width: 180,
+      width: 150,
       fixed: 'right'
     },
     isTableForm: false,
@@ -1300,154 +1528,43 @@ export const SupplierdeliverRequestDetailRules = reactive({
     { required: true, message: '请输入批次', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     { validator: validateBatch, trigger: 'change' }
-  ],
-  produceDate: [
-    { required: true, message: '请输入生产日期', trigger: 'blur' }
-  ],
-  packQty: [
-    { required: true, message: '请输入包装数量', trigger: 'blur' },
-    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
-  ],
-  poNumber: [
-    { required: true, message: '请选择订单号', trigger: 'change' }
-  ],
-  poLine: [
-    { required: true, message: '请选择订单行', trigger: 'change' }
-  ],
-  packUnit: [
-    { required: true, message: '请选择包装规格', trigger: 'change' }
-  ],
-  secondPackUnit: [
-    { required: false, message: '请选择包装规格2', trigger: 'change' }
-  ],
-  secondPackQty: [
-    { required: false, message: '请输入包装数量2', trigger: 'blur' },
-    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
-  ],
-  convertRate: [
-    { required: true, message: '请输入转换率', trigger: 'blur' }
-  ],
-  itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
-  ],
-  remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  // secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
-})
-
-export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-        
-      }
-    },
-    tableForm: {
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   isForm: false,
-  //   tableForm:{
-  //     disabled:true
-  //   }
-  // },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    isTableForm: false,
-    tableForm: {
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  {
-    label: '过期日期',
-    field: 'expireDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD',
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    tableForm: {
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' },
+    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  secondPackUnit: [
+    { required: false, message: '请选择包装规格2', trigger: 'change' }
+  ],
+  secondPackQty: [
+    { required: false, message: '请输入包装数量2', trigger: 'blur' },
+    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择品番', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  // secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
+})
+
+export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单号',
     field: 'poNumber',
@@ -1458,7 +1575,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled:true,
+        disabled: true,
         isSearchList: false,
         searchListPlaceholder: '请选择订单号',
         searchField: 'number',
@@ -1483,7 +1600,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     tableForm: {
       isInpuFocusShow: false,
-      disabled:true,
+      disabled: true,
       searchListPlaceholder: '请选择订单号',
       searchField: 'number',
       searchTitle: '要货计划信息',
@@ -1520,30 +1637,83 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '订单数量',
-    field: 'orderQty',
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
     table: {
       width: 150
     },
     form: {
-      component: 'InputNumber',
       componentProps: {
-        disabled: true,
-        min: 0,
-        precision: 6
+        disabled: true
       }
     },
     tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
+      disabled: true
     }
   },
-  
   {
-    label: '供应商计量数量',
-    field: 'supplierPackQty',
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+
+  {
+    label: '发货数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -1552,33 +1722,30 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       component: 'InputNumber',
       componentProps: {
         disabled:true,
-        min: 1,
+        min: 0,
         precision: 6
       }
     },
-    isTableForm: false,
-    isForm: false,
     tableForm: {
       disabled:true,
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },
   {
-    label: '供应商计量单位',
-    field: 'supplierPackUnit',
+    label: '发货计量单位',
+    field: 'purchaseStdUom',
+    sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    isSearch: true,
     isTable: true,
-    sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
     tableForm: {
-      disabled:true,
+      disabled: true,
       type: 'Select'
     }
   },
@@ -1595,63 +1762,68 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
         min: 0
       }
     },
-    isTableForm: false,
+    isTableForm: true,
     isForm: false,
     tableForm: {
-      disabled:true,
+      disabled: true,
       type: 'InputNumber',
       min: 0
     }
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '库存数量',
+    field: 'balanceQty',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
-    isTableForm: false,
     form: {
       componentProps: {
-        disabled: true
       }
+    },
+    tableForm: {
+      disabled: true
     }
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '库存计量单位',
+    field: 'uom',
     sort: 'custom',
     table: {
       width: 150
     },
+    dictType: DICT_TYPE.UOM,
     form: {
+      component: 'Select',
       componentProps: {
-        disabled: true
       }
     },
     tableForm: {
+      type: 'Select',
       disabled: true
     }
+
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isSearch: true,
+    label: '包装规格',
+    field: 'packUnit',
     isTable: true,
-    table: {
-      width: 150
+    sort: 'custom',
+    form: {
     },
     tableForm: {
-      disabled:true,
-      type: 'Select'
+      type: 'Select',
+      labelField: 'packName',
+      valueField: 'packUnit',
+      initOptions: [{
+        label: '',
+        value: ''
+      }]
     }
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '发货标包数量',
+    field: 'purchaseStdQty',
     sort: 'custom',
     table: {
       width: 150
@@ -1659,36 +1831,20 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled:true,
+        disabled: true,
         min: 0,
-        precision: 6
+        precision: 5
       }
     },
     tableForm: {
-      disabled:true,
+      disabled: true,
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      precision: 5
     }
   },
   {
-    label: '箱规格',
-    field: 'packUnit',
-    isTable: true,
-    sort: 'custom',
-    form: {
-    },
-    tableForm: {
-      type: 'Select',
-      labelField: 'packName',
-      valueField: 'packUnit',
-      initOptions: [{
-        label: '',
-        value: ''
-      }]
-    }
-  },{
-    label: '箱规格数量',
+    label: '库存标包数量',
     field: 'packQty',
     sort: 'custom',
     table: {
@@ -1699,9 +1855,11 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       }
     },
     tableForm: {
-      disabled:true
+      disabled: true
     }
   },
+
+
   // {
   //   label: '托规格',
   //   field: 'secondPackUnit',
@@ -1734,46 +1892,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
   //     disabled:true
   //   }
   // },
-  {
-    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
-  },
+  
 ]))
 
 //表单校验
@@ -1803,7 +1922,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
   //   }
   // },
 {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -1813,6 +1932,25 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
 {
     label: '批次',
     field: 'batch',
@@ -1873,7 +2011,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
 
 export const SupplierdeliverRequestPackage2 = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -1883,6 +2021,22 @@ export const SupplierdeliverRequestPackage2 = useCrudSchemas(reactive<CrudSchema
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '批次',
     field: 'batch',
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue
index 29c8049ae..eff2eb80b 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue
@@ -42,7 +42,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
index adf7e94ef..25cb32f64 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -913,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
 
     {
-      label: '供应商计量数量',
+      label: '供应商发货数量',
       field: 'supplierQty',
       sort: 'custom',
       table: {
@@ -972,7 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 1008
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -990,6 +990,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       },
       sortTableDefault: 7
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 7,
+      isTableForm: false,
+      isSearch: true,
+      isForm: false
+    },
     {
       label: '物料类型',
       field: 'itemType',
@@ -1008,7 +1020,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       }
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -1018,7 +1030,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 7
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
@@ -1163,7 +1175,7 @@ export const PurchasereceiptJobDetailRules = reactive({
   convertRate: [{ required: true, message: '请输入转换率', trigger: 'blur' }],
   toLocationCode: [{ required: true, message: '请选择到库位代码', trigger: 'change' }],
   number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
-  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
   createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
   creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }]
 })
@@ -1464,7 +1476,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -1475,7 +1487,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -1486,7 +1498,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料描述1',
+      label: '背番',
       field: 'itemDesc1',
       sort: 'custom',
       table: {
@@ -1497,7 +1509,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(
       }
     },
     {
-      label: '物料描述2',
+      label: '描述',
       field: 'itemDesc2',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue
index ec7d39e9c..d625337ab 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue
@@ -43,7 +43,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index a71f464b7..e29bed92c 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -396,7 +396,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 300,
       fixed: 'right'
     },
   },
@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,17 +669,29 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:11,
-    hiddenInMain:true
+    sortTableDefault: 10,
+    isTableForm: false,
+    isSearch: true,
+    isForm: false
   },
+  // {
+  //   label: '背番',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:11,
+  //   hiddenInMain:true
+  // },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -834,7 +846,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
@@ -1289,7 +1301,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1305,7 +1317,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1321,7 +1333,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1337,7 +1349,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     }
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue
index f45d42b02..ec7dd2c1b 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -132,7 +132,7 @@
     <template #searchQuery>
       <el-form :inline="true">
         <el-form-item>
-          <el-input v-model="printItemCode" placeholder="请输入物料代码"></el-input>
+          <el-input v-model="printItemCode" placeholder="请输入品番"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="searchPrint">
@@ -581,14 +581,18 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-let array = []//存储可采购数据
+  let array = []//存储可采购数据
+  let arrayTool = []//存储可采购协定品数据
   let array1 = []//存储可制造数据
     let packingNumbers = []
   val.forEach((item,index) => {
     packingNumbers.push(item.number)
-   
-    if (item.itemType == '可采购') {
-      array.push(item)
+   if (item.itemType == '可采购') {
+      if (item.itemBasicType =='TOOL') {
+        arrayTool.push(item)
+      } else {
+        array.push(item)
+      }
     }
     if (item.itemType == '可制造') {
       array1.push(item)
@@ -602,6 +606,16 @@ let array = []//存储可采购数据
       console.log(err)
       message.error('创建标签失败')
     })
+  }
+   // 打印协定品采购件
+  if (arrayTool.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:arrayTool.map(item1=>item1.number)}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
   }
   if (array1.length > 0) {
     await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 7f826010e..be7655c46 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -574,7 +574,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 400,
+      width: 250,
       fixed: 'right'
     },
   }
@@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -766,7 +766,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -776,6 +776,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 7,
+    isTableForm: false,
+    isSearch: true,
+    isForm: false
+  },
   {
     label: '物料类型',
     field: 'itemType',
@@ -797,7 +809,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
 
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -809,7 +821,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -1098,7 +1110,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {
@@ -1411,7 +1423,7 @@ export const PurchasereceiptRequestDetailRules = reactive({
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
 })
 
@@ -1520,7 +1532,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -1536,7 +1548,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1546,7 +1558,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -1556,7 +1568,7 @@ export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive
     isForm: false
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
@@ -2095,7 +2107,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -2111,7 +2123,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -2123,7 +2135,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
@@ -2135,7 +2147,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
   },
   {
-    label: '物料描述2',
+    label: '描述',
     field: 'itemDesc2',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/supplierManage/invoicingcalendar/index.vue b/src/views/wms/supplierManage/invoicingcalendar/index.vue
index f02f1abb0..2aa65919b 100644
--- a/src/views/wms/supplierManage/invoicingcalendar/index.vue
+++ b/src/views/wms/supplierManage/invoicingcalendar/index.vue
@@ -33,7 +33,10 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts
index a20ceb543..18ed97fbf 100644
--- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts
@@ -206,7 +206,7 @@ export const PurchaseClaimRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
 // 表单校验
 export const PurchaseClaimRecordDetailRules = reactive({
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   claimQty: [
     { required: true, message: '请输入索赔数量', trigger: 'blur' }
@@ -218,7 +218,7 @@ export const PurchaseClaimRecordDetailRules = reactive({
 
 export const PurchaseClaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: false,
@@ -227,7 +227,7 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm:{
       multiple:false,//多选
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',// 输入框占位文本
+      searchListPlaceholder: '请选择品番',// 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '供应商物料信息', // 查询弹窗标题
       searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
@@ -265,7 +265,7 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled:true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '供应商物料信息', // 查询弹窗标题
         searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
@@ -297,7 +297,7 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -307,6 +307,16 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     },
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue
index 6b1f47fce..744c02678 100644
--- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue
+++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue
@@ -40,7 +40,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -381,7 +381,7 @@ const submitForm = async (formType, submitData) => {
   })
   if (isExist) {
     formRef.value.formLoading = false
-    return message.warning('物料代码重复')
+    return message.warning('品番重复')
   }
   data.subList.forEach((obj) => {
     if (obj.claimQty == 0) {
diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts
index 413440157..388936369 100644
--- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts
@@ -187,7 +187,7 @@ export const PurchaseClaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 // 表单校验
 export const PurchaseClaimRequestDetailRules = reactive({
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   claimQty: [
     { required: true, message: '请输入索赔数量', trigger: 'blur' }
@@ -199,7 +199,7 @@ export const PurchaseClaimRequestDetailRules = reactive({
 
 export const PurchaseClaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: false,
@@ -209,7 +209,7 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       multiple: true,//多选
       isInpuFocusShow: false, // 开启查询弹窗
       disabled:true,
-      searchListPlaceholder: '请选择物料代码',// 输入框占位文本
+      searchListPlaceholder: '请选择品番',// 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '供应商物料信息', // 查询弹窗标题
       searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
@@ -247,7 +247,7 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         disabled:true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '供应商物料信息', // 查询弹窗标题
         searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
@@ -279,7 +279,7 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
 
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -293,6 +293,24 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    hiddenSearchHigh:true,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled:true
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    }
+  },
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue
index 32ac1a8ea..72e858f79 100644
--- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue
+++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue
@@ -40,7 +40,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -176,6 +176,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           tfk['itemCode'] = item['itemCode']
           tfk['itemName'] = item['itemName']
           tfk['uom'] = item['supplierUom']
+          tfk['backNumber'] = item['backNumber']
           tableData.value.push(tfk)
         })
       }
@@ -501,7 +502,7 @@ const submitForm = async (formType, submitData) => {
   })
   if (isExist) {
     formRef.value.formLoading = false
-    return message.warning('物料代码重复')
+    return message.warning('品番重复')
   }
   data.subList.forEach((obj) => {
     if (obj.claimQty == 0) {
diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue
index a3c980593..f1aa4c716 100644
--- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue
@@ -39,7 +39,10 @@
           <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
         </template>
         <template #action="{ row,$index }">
-          <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+          <ButtonBaseMore
+            :Butttondata="butttondata(row, $index)"
+            @button-base-click="buttonTableClick($event, row)"
+          />
         </template>
       </Table>
     </ContentWrap>
diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts
index 47515e88f..1c79a7820 100644
--- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts
@@ -1524,7 +1524,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     sortTableDefault:3,
@@ -1533,7 +1533,18 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料描述',
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: false,
+    hiddenSearchHigh:true,
+    sortTableDefault:3,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '描述',
     field: 'itemDesc',
     table: {
       width: 150
@@ -1570,7 +1581,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTable: true,
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1780,7 +1791,7 @@ export const SupplierinvoiceRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   requestTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 459b3230b..cabf4f58c 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -33,7 +33,10 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index e35619051..cf8c8e0a3 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -39,7 +39,10 @@
         <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -86,7 +89,7 @@
         rowField:'annexMasterId',
       }],
     },{
-      label: t('ts.货运单附件'),
+      label: t('ts.发货单附件'),
       prop: 'Annex',
       tableName:'waybill',
       showDownload:true,
@@ -95,6 +98,16 @@
         queryField:'tableId',
         rowField:'annexMasterId',
       }],
+    },{
+      label: t('ts.对账单附件'),
+      prop: 'Annex',
+      tableName:'statement',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
     },{
       label: t('ts.其他附件'),
       prop: 'Annex',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 13675b376..ae7ce5d13 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -16,6 +16,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: false
   },
+  
   {
     label: '发票申请单号',
     field:'requestNumber',
@@ -286,9 +287,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
     }
   },
-
-
-
   {
     label: '索赔金额',
     field: 'claimAmount',
@@ -720,6 +718,17 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:true,
     isForm: false
   },
+  {
+    label: '模具分摊回转凭证号',
+    field: 'allocationTransferNumber',
+    sort: 'custom',
+    table: {
+      width: 200,
+    },
+    sortTableDefault:11,
+    isTable:true,
+    isForm: false
+  },
   // {
   //   label: '冲销日记帐',
   //   field: 'reverseInvoiceJournal',
@@ -736,6 +745,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
+  {
+    label: '发票总额',
+    field: 'invoiceAmountMain',
+    formatter: accountantFormart,
+    table: {
+      width: 160
+    },
+    sortTableDefault: 12,
+  },
   {
     label: '索赔总额',
     field: 'claimAmount',
@@ -1339,9 +1357,14 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     },
 
   },
+
   {
-    label: '',
-    field: '',
+    label: '发票总额',
+    field: 'invoiceAmountMain',
+    formatter: accountantFormart,
+    table: {
+      width: 160
+    },
     isForm: false,
     isTable: false,
     isSearch: false,
@@ -1547,7 +1570,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     sortTableDefault:3,
@@ -1556,7 +1579,21 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料描述',
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: false,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '描述',
     field: 'itemDesc',
     table: {
       width: 150
@@ -1593,7 +1630,24 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTable: true,
   },
   {
-    label: '物料名称',
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sortTableDefault:6,
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:true,
+    isDetail: false,
+    isTable: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -1823,7 +1877,7 @@ export const SupplierinvoiceRecordDetailRules = reactive({
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   requestTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 8f967cdf1..eed4c76b0 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -47,7 +47,7 @@
         }}</span>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -87,7 +87,8 @@
           discountAmount1 = 0,
           beforeTaxDiffAmount = 0,
           taxAmountDiff = 0,
-          rebateTax=0,
+          rebateTax = 0,
+          claimAmount = 0,
         } = formModel
         // 2、系统税额：每条数据的合同价格X可开票数量，计算结果取两位小数之后*税率的计算结果，再保留2位。所有子表数据再求和
         if (formType == 'update') {
@@ -103,6 +104,7 @@
           }
           formRef.value.setValues({
             afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额-索赔总额
+            invoiceAmountMain: amount - claimAmount, // 发票总额：供应商维护未税金额-索赔总额
             adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额
             beforeTaxDiffAmount: beforeTaxAmount - amount, //未税差额：未税金额-系统未税金额
             taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额
@@ -131,6 +133,7 @@
           formRef.value.setValues({
             taxAmount: taxAmount_,
             afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额-索赔总额
+            invoiceAmountMain: amount - claimAmount, // 发票总额：供应商维护未税金额-索赔总额
             adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额
             beforeTaxDiffAmount: beforeTaxAmount - amount, //未税差额：未税金额-系统未税金额
             taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额
@@ -163,7 +166,8 @@
               ),
             0
           )
-        }
+  }
+        sumObject.invoiceAmountMain = (Number(sumObject.amount) -Number(formRef.value.formModel.claimAmount)).toFixed(2), // 发票总额：供应商维护未税金额-索赔总额
         formRef.value.setValues(sumObject)
       }
     "
@@ -598,10 +602,11 @@ const searchTableSuccess = (formField, searchField, val, searchFormRef, type, ro
           newRow['invoicableQuantity'] = item['invoicableQuantity']
           newRow['itemCode'] = item['itemCode']
           newRow['itemName'] = item['itemName']
-          
+          newRow['purchaseStdUom'] = item['purchaseStdUom']
           newRow['deliveryDate'] = item['prhRcpDate']
           newRow['arrivalQty'] = item['prhRcvd']
           newRow['id'] = item['id']
+          newRow['backNumber'] = item['backNumber']
           newRow['currency'] = item['currency']
         }
         tableData.value.push(newRow)
@@ -986,7 +991,7 @@ const claimDetailsList = ref([])
 const claimDetails = async (supplierCode) => {
   claimDetailsList.value = await PurchaseClaimRequestDetailApi.getPurchaseClaimRequestDetailList(supplierCode)
   formRef.value.formRef.formModel.claimAmount = claimDetailsList.value.map(item => item.claimAmount).reduce((prev, item) => prev + item).toFixed(5)
-  
+  formRef.value.formRef.formModel.invoiceAmountMain = (Number(formRef.value.formRef.formModel.amount) -Number(formRef.value.formModel.claimAmount)).toFixed(2) // 发票总额：供应商维护未税金额-索赔总额
 }
   // 编辑的时候获取索赔明细
 const claimDetailsForUpdate = async (supplierCode,id) => {
@@ -1039,14 +1044,20 @@ const detailAnnexTable = ref([
     fileSize: 20,
     maxLength:1,
     limit:1,
-    fileType:['pdf']
+    fileType:['pdf','ofd']
   },
   {
-    label: t('ts.货运单附件'),
+    label: t('ts.发货单附件'),
     prop: 'Annex',
     tableName: 'waybill',
     fileSize: 20
   },
+  {
+    label: t('ts.对账单附件'),
+    prop: 'Annex',
+    tableName: 'statement',
+    fileSize: 20
+  },
   {
     label: t('ts.其他附件'),
     prop: 'Annex',
@@ -1213,7 +1224,8 @@ const submitPurchasePass = async (id, submitData) => {
 const formFinanceRef = ref()
 const handleFinanceApp = async (row) => {
   row.postingDate = dayjs().valueOf()
-  row.voucherNumberRemark = '收到' + row.supplierName + '发票' + row.goldenTaxInvoiceNumber
+  //描述用供应商简称
+  row.voucherNumberRemark = '收到' + row.supplierShortName + '发票' + row.goldenTaxInvoiceNumber
   formFinanceRef.value.open('update', row, null, '财务通过', '财务通过')
 }
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 8c0eb4cc9..dd7e60b56 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -123,9 +123,13 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudS
     field: 'currency',
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode'
   },
+  {
+    label: '背番',
+    field: 'backNumber'
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -270,6 +274,26 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       precision: 2,
     }
   },
+  {
+    label: '发票总额',
+    field: 'invoiceAmountMain',
+    formatter: accountantFormart,
+    sortTableDefault: 3,
+    table: {
+      width: 160
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
+    },
+  },
   {
     label: '税率(%)',
     field: 'taxRate',
@@ -1591,7 +1615,26 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     },
 
   },
-  
+  {
+    label: '发票总额',
+    field: 'invoiceAmountMain',
+    formatter: accountantFormart,
+    table: {
+      width: 160
+    },
+    sortTableDefault: 8,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        precision: 2,
+        disabled: true,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 2,
+    },
+  },
 
 ]))
 
@@ -1726,7 +1769,7 @@ export const SupplierinvoiceRequestFinanceRules = reactive({
  */
 export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     table: {
       width: 150
@@ -1741,7 +1784,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     table: {
       width: 150
@@ -1756,7 +1799,25 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料描述',
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '描述',
     field: 'itemDesc',
     table: {
       width: 150
@@ -1952,6 +2013,22 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled:true
     }
   },
+  {
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:true,
+    isDetail: false,
+    isTable: true,
+    tableForm:{
+      disabled:true
+    }
+  },
   {
     label: '订单号',
     field: 'poNumber',
@@ -2281,7 +2358,7 @@ export const ClaimDetails = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     table: {
       width: 150
@@ -2290,6 +2367,16 @@ export const ClaimDetails = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '索赔数量',
     field: 'claimQty',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index 569bfbc44..05fb67a8c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -122,7 +122,7 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudS
     field: 'currency',
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode'
   },
   {
@@ -1688,7 +1688,7 @@ export const SupplierinvoiceRequestFinanceRules = reactive({
  */
 export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     table: {
       width: 150
@@ -1703,7 +1703,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     table: {
       width: 150
@@ -1718,7 +1718,17 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料描述',
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    hiddenSearchHigh:true,
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '描述',
     field: 'itemDesc',
     table: {
       width: 150
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
index 827f95a2c..671d71571 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SupplierinvoiceInvoiced.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="SupplierinvoiceInvoicedAllSchemas.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,7 +11,7 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="SupplierinvoiceInvoiced.allSchemas"
+      :allSchemas="SupplierinvoiceInvoicedAllSchemas.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,7 +33,10 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -43,7 +46,7 @@
     ref="basicFormRef"
     @success="formsSuccess"
     :rules="SupplierinvoiceInvoicedRules"
-    :formAllSchemas="SupplierinvoiceInvoiced.allSchemas"
+    :formAllSchemas="SupplierinvoiceInvoicedAllSchemas.allSchemas"
     :apiUpdate="SupplierinvoiceInvoicedApi.updateSupplierinvoiceInvoiced"
     :apiCreate="SupplierinvoiceInvoicedApi.createSupplierinvoiceInvoiced"
     @searchTableSuccess="searchTableSuccess"
@@ -51,7 +54,7 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierinvoiceInvoiced.allSchemas" />
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierinvoiceInvoicedAllSchemas.allSchemas" />
 
   <!-- 导入 -->
   <!-- <ImportForm ref="importFormRef" url="/wms/supplierinvoice-invoiced/import" :importTemplateData="importTemplateData" @success="importSuccess" /> -->
@@ -66,6 +69,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SupplierinvoiceInvoiced' })
 
@@ -75,7 +79,8 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(SupplierinvoiceInvoiced.allSchemas.tableColumns)
+const SupplierinvoiceInvoicedAllSchemas = ref(cloneDeep(SupplierinvoiceInvoiced))
+const tableColumns = ref(SupplierinvoiceInvoicedAllSchemas.value.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -142,7 +147,15 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) =>{
+const butttondata = (row) => {
+  const hasPermi = ref('')
+   if (routeName.value == 'SupplierinvoiceInvoiced') {
+    // 待开票数据查询-财务
+   hasPermi.value = 'wms:supplierinvoice-invoiced:'
+  } else if (routeName.value == 'SupplierinvoiceInvoicedWork') {
+    // 待开票数据查询-工务
+   hasPermi.value = 'wms:supplierinvoice-invoiced-work:'
+  }
   return [
     // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除
@@ -154,7 +167,7 @@ const butttondata = (row) =>{
       type: 'primary',
       color: '',
       link: true, // 文本展现按钮
-      hasPermi: 'wms:supplierinvoice-invoiced:agree'
+      hasPermi: hasPermi.value +'agree'
     },
     {
       label: t('作废'),
@@ -163,7 +176,7 @@ const butttondata = (row) =>{
       type: 'danger',
       color: '',
       link: true, // 文本展现按钮
-      hasPermi: 'wms:supplierinvoice-invoiced:refuse'
+      hasPermi: hasPermi.value +'refuse'
     }
   ]
 }
@@ -273,8 +286,15 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await SupplierinvoiceInvoicedApi.exportSupplierinvoiceInvoiced(tableObject.params)
-    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    if (routeName.value == 'SupplierinvoiceInvoiced') {
+    // 待开票数据查询-财务
+      const data = await SupplierinvoiceInvoicedApi.exportSupplierinvoiceInvoiced(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    } else if (routeName.value == 'SupplierinvoiceInvoicedWork') {
+      // 待开票数据查询-工务
+      const data = await SupplierinvoiceInvoicedApi.exportSupplierinvoiceInvoicedWork(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
   } catch {
   } finally {
     loadDone()
@@ -304,11 +324,34 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
+// 不同业务展示不同的字段
+const getFiled=()=> {
+   if (routeName.value == 'SupplierinvoiceInvoiced') {
+    // 待开票数据查询-财务
+    SupplierinvoiceInvoicedAllSchemas.value = cloneDeep(SupplierinvoiceInvoiced)
+    tableColumns .value= SupplierinvoiceInvoicedAllSchemas.value.allSchemas.tableColumns
+
+  } else if (routeName.value == 'SupplierinvoiceInvoicedWork') {
+    // 待开票数据查询-工务
+    SupplierinvoiceInvoicedAllSchemas.value.allSchemas.formSchema = SupplierinvoiceInvoicedAllSchemas.value.allSchemas.formSchema.filter(item=>item.field!='purchasePrice')
+    SupplierinvoiceInvoicedAllSchemas.value.allSchemas.tableColumns = SupplierinvoiceInvoicedAllSchemas.value.allSchemas.tableColumns.filter(item=>item.field!='purchasePrice')
+    SupplierinvoiceInvoicedAllSchemas.value.allSchemas.tableFormColumns = SupplierinvoiceInvoicedAllSchemas.value.allSchemas.tableFormColumns.filter(item => item.field != 'purchasePrice')
+    SupplierinvoiceInvoicedAllSchemas.value.allSchemas.detailSchema = SupplierinvoiceInvoicedAllSchemas.value.allSchemas.detailSchema.filter(item => item.field != 'purchasePrice')
+    tableColumns .value= SupplierinvoiceInvoicedAllSchemas.value.allSchemas.tableColumns
+  }
+}
 
 /** 初始化 **/
 onMounted(async () => {
-  getList()
+  await getList()
+  await getFiled()
   // importTemplateData.templateUrl = await SupplierinvoiceInvoicedApi.importTemplate()
 })
 
+onActivated(async () => {
+  routeName.value = route.name
+  await getFiled()
+  await getList()
+})
+
 </script>
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
index 51a203719..87ba7f281 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
@@ -213,8 +213,28 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '计量单位',
-    field: 'uom',
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    hiddenSearchHigh:true,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '计量单位',
+  //   field: 'uom',
+  //   dictType: DICT_TYPE.UOM,
+  //   dictClass: 'string', 
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string', 
     sort: 'custom',