diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
index 0a6270e46..5eaaaf516 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
@@ -372,7 +372,8 @@ const onChange = (field, e)=>{
     } else {
       Area.allSchemas.formSchema.forEach((item) => {
         if (item.field == 'manageMode') {
-          item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY')
+          item.componentProps.options = manageModeOptions.value
+          // item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY')
           basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value
         }
       })
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index e1229f9ba..5b9215bbb 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -370,6 +370,15 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 100
     } ,
   },
+  {
+    label: '产品类',
+    field: 'prodCla',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
   {
     label: '创建者',
     field: 'creator',
@@ -540,17 +549,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
 
-  {
-    label: '产品类',
-    field: 'prodCla',
-    sort: 'custom',
-    isForm:false,
-    isTable: false,
-    isDetail:false,
-    table: {
-      width: 100
-    } ,
-  },
+
   {
     label: '种类',
     field: 'category',
diff --git a/src/views/wms/basicDataManage/labelManage/productionLineLabel/index.vue b/src/views/wms/basicDataManage/labelManage/productionLineLabel/index.vue
new file mode 100644
index 000000000..f7528a1a8
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/productionLineLabel/index.vue
@@ -0,0 +1,293 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable ref="tableRef" :selection="true"
+      :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"
+      @getSelectionRows="getSelectionRows"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules  } from './productionLineLabel.data'
+import * as BarbasicApi from '@/api/wms/barbasic'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatTime } from '@/utils/index'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+// 库位标签
+defineOptions({ name: 'ProductionLineLabel' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * PurchasePackage type = PurchaseLabel 采购件标签记录页面
+ * ManufacturePackage type = MakeLabel  制造件标签记录页面
+ * UtensilPackage type = ContainerLabel  器具标签记录页面
+ * SupplierPackage type = PurchaseLabel  供应商发货标签记录(用采购标签)
+ * ProductionLineLabel type = ProductionLineLabel  库位标签记录页面
+ */
+ const type = ref('ProductionLineLabel')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BarbasicApi.getBarbasicPage // 分页接口
+})
+tableObject.params.type = type.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } 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 if (val=='selection_point'){//批量打印
+    handleSelectionPoint()
+  }else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return[
+  defaultButtons.mainListPointBtn(null), // 标签打印
+  defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:barbasic:enable'}), //启用
+  defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:barbasic:disable'}), //停用
+]}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  } else if (val == 'enable') {
+    handleEnable(row.id)
+  } else if (val == 'disable') {
+    handleDisable(row.id)
+  }
+}
+
+
+const handleEnable = async (id: number) => {
+  try {
+    await BarbasicApi.enableOption(id)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+const handleDisable = async (id: number) => {
+  try {
+    await BarbasicApi.disableOption(id)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
+    })
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,"labelBarbasic")
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BarbasicApi.deleteBarbasic(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await BarbasicApi.exportLocationBarbasic(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/1075309898605109248?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&relateNumber='+row.id)
+}
+
+// const srcPoint = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken())
+const handleSelectionPoint = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  console.log('批量打印',rows.join(','))
+  window.open(src.value+'&relateNumber='+rows.join(','))
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    type:type.value
+  }
+  getList() // 刷新当前列表
+}
+const searchList = (model)=>{
+  selectionRows.value = []
+  // model.available='TRUE'
+  model.type='ProductionLineLabel'
+  setSearchParams(model)
+}
+watch(
+  () => tableObject.tableList,
+  () => {
+    const currentRows = selectionRows.value.find(item=>item.currentPage==tableObject.currentPage)
+    if(currentRows){
+      nextTick(() => {
+        currentRows.selectionRows.forEach(item=>{
+          tableRef.value.toggleRowSelection(item,true)
+        })
+      })
+    }
+  }
+)
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  if(currentRows){
+    currentRows.selectionRows = currentPageSelectionRows
+  }else{
+    selectionRows.value.push({
+      currentPage,
+      selectionRows:currentPageSelectionRows
+    })
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  // tableObject.params = {
+  //   available: 'TRUE',
+  //   type: 'ProductionLineLabel'
+  // }
+  getList()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/labelManage/productionLineLabel/productionLineLabel.data.ts b/src/views/wms/basicDataManage/labelManage/productionLineLabel/productionLineLabel.data.ts
new file mode 100644
index 000000000..308e0d512
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/productionLineLabel/productionLineLabel.data.ts
@@ -0,0 +1,217 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [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',
+  // },
+  {
+    label: '标签状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string',
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '库位代码',
+    field: 'relateNumber',
+    sort: 'custom',
+    table: {
+      width: 210
+    }
+  },
+  {
+    label: '库位名称',
+    field: 'locationName',
+    sort: 'custom',
+    table: {
+      width: 210
+    }
+  },
+  {
+    label: '标签条码字符串',
+    field: 'barcodeString',
+    sort: 'custom',
+    table: {
+      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: '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: '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',
+      }
+    }
+  },
+  {
+    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',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index ce8f33660..5e2ee2708 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -235,28 +235,28 @@ export const Balance = useCrudSchemas(
     //   },
     //   isTable: false,
     // },
-    {
-      label: '到货日期',
-      field: 'arriveDate',
-      isTable: true,
-      formatter: dateFormatter2,
-      detail: {
-        dateFormat: 'YYYY-MM-DD'
-      },
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'date',
-          dateFormat: 'YYYY-MM-DD',
-          valueFormat: 'x'
-        }
-      }
-    },
+    // {
+    //   label: '到货日期',
+    //   field: 'arriveDate',
+    //   isTable: true,
+    //   formatter: dateFormatter2,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       style: { width: '100%' },
+    //       type: 'date',
+    //       dateFormat: 'YYYY-MM-DD',
+    //       valueFormat: 'x'
+    //     }
+    //   }
+    // },
     {
       label: '生产日期',
       field: 'produceDate',
diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts
index 72a94e47d..c2e0c16c1 100644
--- a/src/views/wms/inventoryManage/transaction/transaction.data.ts
+++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts
@@ -205,28 +205,28 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
-    isTable: true,
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-  },
+  // {
+  //   label: '到货日期',
+  //   field: 'arriveDate',
+  //   isTable: true,
+  //   formatter: dateFormatter2,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'date',
+  //       dateFormat: 'YYYY-MM-DD',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
   {
     label: '生产日期',
     field: 'produceDate',
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index c8c057454..914ce3430 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -645,7 +645,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         value: 'warehouseCode',
         message: '请选择仓库代码!',
         isMainValue: true
-      }],
+        }],
+      isRepeat:true,
       verificationParams: [{
         key: 'code',
         action: '==',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
index 09fbd3265..708d34c38 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -57,6 +57,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @clearInput="clearInput"
   />
 
   <!-- 详情 -->
@@ -124,23 +125,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['fromAreaCode'] = item['areaCode']
           newRow['toAreaCode'] = item['areaCode']
           newRow['inventoryStatus'] = item['inventoryStatus']
-          newRow['fromPackUnit'] = item['packUnit']
+          // newRow['fromPackUnit'] = item['packUnit']
           newRow['fromPackQty'] = item['packQty']
           tableData.value.push(newRow)
         })
 
       } else if (formField == 'toPackUnit') {
         row['toPackUnit'] = val[0]['packUnit']
-        row['toPackQty'] = val[0]['packQty']
+        row['fromPackUnit'] = val[0]['packUnit']
+        row['toPackQty'] = 0
       } else {
         row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      if (formField == 'fromWarehouseCode') {
-        setV['fromWarehouseCode'] = val[0]['code']
-        setV['toWarehouseCode'] = val[0]['code']
+      if (formField == 'fromLocationCode') {
+        setV['toLocationCode'] = val[0]['code']
       }
       formRef.setValues(setV)
     }
@@ -403,13 +404,17 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
-  if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) {
-    message.warning('从包装规格与到包装规格不能相同')
-    return
-  }
+  // if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) {
+  //   message.warning('从包装规格与到包装规格不能相同')
+  //   return
+  // }
   if(tableData.value.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
     return
+  }
+   if(tableData.value.find(item => (item.toPackQty <= 0))) {
+    message.warning('到标包数量必须大于0')
+    return
   }
   formRef.value.formLoading = true
   try {
@@ -477,7 +482,11 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+const clearInput = (field, row, index) => {
+  if (field == 'toPackUnit') {
+    row.fromPackUnit = ''
+  }
+}
 /** 初始化 **/
 onMounted(async () => {
   getList()
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 439dc58bf..92e073cff 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -496,7 +496,7 @@ export const PackageoverRequestMain = useCrudSchemas(
 
 // 表单校验
 export const PackageoverRequestMainRules = reactive({
-  fromWarehouseCode: [{ required: true, message: '请选择仓库代码', trigger: 'change' }]
+  fromLocationCode: [{ required: true, message: '请选择从库位代码', trigger: 'change' }]
 })
 
 export const PackageoverRequestDetail = useCrudSchemas(
@@ -534,9 +534,9 @@ export const PackageoverRequestDetail = useCrudSchemas(
           searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
           searchCondition: [
             {
-              key: 'warehouseCode',
-              value: 'fromWarehouseCode',
-              message: '请填写从仓库代码！',
+              key: 'locationCode',
+              value: 'fromLocationCode',
+              message: '请填写从库位代码！',
               isMainValue: true
             },
             {
@@ -557,9 +557,9 @@ export const PackageoverRequestDetail = useCrudSchemas(
         searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
         searchCondition: [
           {
-            key: 'warehouseCode',
-            value: 'fromWarehouseCode',
-            message: '请填写从仓库代码！',
+            key: 'locationCode',
+            value: 'fromLocationCode',
+            message: '请填写从库位代码！',
             isMainValue: true
           },
           {
@@ -620,13 +620,15 @@ export const PackageoverRequestDetail = useCrudSchemas(
       tableForm: {
         type: 'InputNumber',
         min: 0,
-        precision: 6
+        precision: 6,
+        disabled:true
       },
       form: {
         component: 'InputNumber',
         componentProps: {
           min: 0,
-          precision: 6
+          precision: 6,
+          disabled: true
         }
       }
     },
@@ -659,7 +661,8 @@ export const PackageoverRequestDetail = useCrudSchemas(
         width: 120
       },
       tableForm: {
-        enterSearch: true,
+        disabled:true,
+        enterSearch: false,
         isInpuFocusShow: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择包装规格', // 输入框占位文本
@@ -694,7 +697,8 @@ export const PackageoverRequestDetail = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
-          isSearchList: true, // 开启查询弹窗
+          disabled: true,
+          isSearchList: false, // 开启查询弹窗
           searchListPlaceholder: '请选择包装规格', // 输入框占位文本
           searchField: 'packUnit', // 查询弹窗赋值字段
           searchTitle: '物料包装信息', // 查询弹窗标题
@@ -828,11 +832,13 @@ export const PackageoverRequestDetail = useCrudSchemas(
         width: 120
       },
       tableForm: {
-        disabled: true
+        // disabled: true
+        type:'InputNumber'
       },
       form: {
+        component:'InputNumber',
         componentProps: {
-          disabled: true
+          // disabled: true
         }
       }
     },
@@ -1020,5 +1026,6 @@ export const PackageoverRequestDetail = useCrudSchemas(
 export const PackageoverRequestDetailRules = reactive({
   itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
   fromPackUnit: [{ required: true, message: '请选择从包装规格', trigger: 'change' }],
-  toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }]
+  toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }],
+  toPackQty: [{ required: true, message: '请输入到标包数量', trigger: ['change','blur'] }],
 })
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index b7a4f9f9c..55e2874ab 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -745,28 +745,28 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '单价',
-    field: 'singlePrice',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '金额',
-    field: 'amount',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
+  // {
+  //   label: '单价',
+  //   field: 'singlePrice',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //   }
+  // },
+  // {
+  //   label: '金额',
+  //   field: 'amount',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //   }
+  // },
   {
     label: '从库位组代码',
     field: 'fromLocationGroupCode',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 18f751cbf..ee287c7de 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -243,9 +243,9 @@ export const ScrapRequestMain = useCrudSchemas(
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+          searchListPlaceholder: '请选择责任部门', // 输入框占位文本
           searchField: 'costcentreDescription', // 查询弹窗赋值字段
-          searchTitle: '成本中心代码', // 查询弹窗标题
+          searchTitle: '责任部门', // 查询弹窗标题
           searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
           searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
           searchCondition: [{
@@ -675,6 +675,7 @@ export const ScrapRequestMain = useCrudSchemas(
         width: 150
       },
       form: {
+        value: '',
         componentProps: {
           filterable: true
         }
@@ -693,6 +694,7 @@ export const ScrapRequestMain = useCrudSchemas(
         width: 150
       },
       form: {
+        value:'',
         componentProps: {
           filterable: true
         }
@@ -711,6 +713,7 @@ export const ScrapRequestMain = useCrudSchemas(
         width: 150
       },
       form: {
+        value: '',
         componentProps: {
           filterable: true
         }
@@ -1220,50 +1223,50 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 2
     }
   },
-  {
-    label: '单价',
-    field: 'singlePrice',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled: true,
-        min: 0,
-        precision: 2,
-      },
-    },
-    tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      min: 0,
-      precision: 2,
-    }
-  },
-  {
-    label: '金额',
-    field: 'amount',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled:true,
-        min: 0,
-        precision: 2,
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      disabled:true,
-      min: 0,
-      precision: 2,
-    },
-  },
+  // {
+  //   label: '单价',
+  //   field: 'singlePrice',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       disabled: true,
+  //       min: 0,
+  //       precision: 2,
+  //     },
+  //   },
+  //   tableForm: {
+  //     disabled: true,
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 2,
+  //   }
+  // },
+  // {
+  //   label: '金额',
+  //   field: 'amount',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       disabled:true,
+  //       min: 0,
+  //       precision: 2,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     disabled:true,
+  //     min: 0,
+  //     precision: 2,
+  //   },
+  // },
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 26728daa6..2f2d479fe 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -501,13 +501,13 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  if(!data.destination){
-    await ElMessageBox.confirm('未填写目的地，是否保存申请？', '提示', {
-      confirmButtonText: '是',
-      cancelButtonText: '否',
-      type: 'warning'
-    })
-  }
+  // if(!data.destination){
+  //   await ElMessageBox.confirm('未填写目的地，是否保存申请？', '提示', {
+  //     confirmButtonText: '是',
+  //     cancelButtonText: '否',
+  //     type: 'warning'
+  //   })
+  // }
   data.subList = tableData.value // 拼接子表数据参数
   try {
     if (formType === 'create') {
diff --git a/src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue b/src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue
index f0173da09..33142a146 100644
--- a/src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue
+++ b/src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue
@@ -100,7 +100,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:'wms:repleinshItemCodeConsumeRecord:create'}), // 新增
-  // defaultButtons.defaultImportBtn({hasPermi:'wms:repleinshItemCodeConsumeRecord:import'}), // 导入
+  defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index b05c0f139..6ba95ddb3 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -2221,9 +2221,9 @@ export const ProductreceiptRequestLabelRules = reactive({
   productionLineCodePackage: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  batch: [
-    { required: true, message: '请选择批次', trigger: ['change','blur'] }
-  ],
+  // batch: [
+  //   { required: true, message: '请选择批次', trigger: ['change','blur'] }
+  // ],
   packUnit: [
     { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
   ],
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 56b90b895..32c0b851b 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -2189,7 +2189,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(
 export const ProductreceiptRequestLabelRules = reactive({
   supplierItemCode: [{ required: true, message: '请选择供应商', trigger: 'change' }],
   productionLineCodePackage: [{ required: true, message: '请选择生产线', trigger: 'change' }],
-  batch: [{ required: true, message: '请选择批次', trigger: ['change', 'blur'] }],
+  // batch: [{ required: true, message: '请选择批次', trigger: ['change', 'blur'] }],
   packUnit: [
     { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
   ],
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index d0b59b832..826b859bd 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -76,7 +76,7 @@
     @onBlur="onEnter">
   
     <template #TableFormHead>
-     <div style="border-top:1px solid #ebeef5;padding:10px 10px 0 10px ;margin-right:10px">
+     <div style="border-top:1px solid #ebeef5;padding:10px 10px 0 10px ;margin-right:10px" v-if="clickType =='create'">
       <el-form :inline="true" :model="tableDataSearch">
         <el-form-item label="筛选：   品番">
           <el-input v-model="tableDataSearch.itemCode" placeholder="请输入品番" clearable @change="changeTableDataSearch"/>
@@ -544,9 +544,11 @@ const isShowMainButton1 = (row, val) => {
   }
 
   /** 添加/修改操作 */
-  const formRef = ref()
-  const openForm = async (type : string, row ?: number) => {
+const formRef = ref()
+const clickType = ref('')
+const openForm = async (type : string, row ?: number) => {
     clearTableDataSearch()
+    clickType.value = type
     formRef.value.open(type, row)
     if('create'==type){
       nextTick(async () => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 2ab5f1826..8d38b3533 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -938,24 +938,24 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       }
     },
-    {
-      label: '箱数',
-      field: 'orderQty',
-      sort: 'custom',
-      sortSearchDefault: 8,
-      sortTableDefault:23,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      tableForm: {
-        disabled: true
-      }
-    },
+    // {
+    //   label: '箱数',
+    //   field: 'orderQty',
+    //   sort: 'custom',
+    //   sortSearchDefault: 8,
+    //   sortTableDefault:23,
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   },
+    //   tableForm: {
+    //     disabled: true
+    //   }
+    // },
     {
       label: '采购标包数量',
       field: 'purchaseStdQty',
@@ -1039,7 +1039,6 @@ export const PurchasePlanDetail = useCrudSchemas(
       isTableForm: false,
       isForm: false,
       isTable: true,
-      hiddenInMain: true,
     },
     {
       label: '已收采购数量',
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
index a2c52ced6..e80bb0129 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
@@ -116,24 +116,27 @@ const { getList, setSearchParams } = tableMethods
     }
   }
 
-// 列表头部按钮
-const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-invoiced:create'}), // 新增
-  // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierinvoice-invoiced:import'}), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
-  defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPass'}), //批量通过 
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
+const HeadButttondata = ref([])
+if(routeName.value == 'SupplierinvoiceInvoiced'){
+  HeadButttondata.value = [
+    defaultButtons.defaultExportBtn(null), // 导出
+    defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPass'}), //批量通过 
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+  ]
+} else {
+  console.log(routeName.value)
+  HeadButttondata.value = [
+    defaultButtons.defaultExportBtn(null), // 导出
+    defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPassWork'}), //批量通过 
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+  ]
+}
+
+
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {