修改

3 months ago · 2df0646ff6
9 changed files with 3389 additions and 2 deletions
--- a/src/api/wms/productionscrapRecordDetail/index.ts
+++ b/src/api/wms/productionscrapRecordDetail/index.ts
@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+export interface ProductionscrapRecordDetailVO {
+  id: number
+  productionLineCode: string
+  workStationCode: string
+  inventoryStatus: string
+  fromOwnerCode: string
+  fromPackingNumber: string
+  fromContainerNumber: string
+  fromBatch: string
+  fromLocationCode: string
+  fromLocationGroupCode: string
+  fromAreaCode: string
+  toOwnerCode: string
+  toPackingNumber: string
+  toContainerNumber: string
+  toBatch: string
+  toLocationCode: string
+  toLocationGroupCode: string
+  toAreaCode: string
+  masterId: number
+  number: string
+  itemCode: string
+  remark: string
+  siteId: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  code: string
+  interfaceType: string
+  jobDetailId: string
+}
+
+// 查询线边原料报废记录子列表
+export const getProductionscrapRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionscrap-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionscrap-record-detail/page`, params })
+  }
+}
+
+// 查询线边原料报废记录子详情
+export const getProductionscrapRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productionscrap-record-detail/get?id=` + id })
+}
+
+// 新增线边原料报废记录子
+export const createProductionscrapRecordDetail = async (data: ProductionscrapRecordDetailVO) => {
+  return await request.post({ url: `/wms/productionscrap-record-detail/create`, data })
+}
+
+// 修改线边原料报废记录子
+export const updateProductionscrapRecordDetail = async (data: ProductionscrapRecordDetailVO) => {
+  return await request.put({ url: `/wms/productionscrap-record-detail/update`, data })
+}
+
+// 删除线边原料报废记录子
+export const deleteProductionscrapRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productionscrap-record-detail/delete?id=` + id })
+}
+
+// 导出线边原料报废记录子 Excel
+export const exportProductionscrapRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/productionscrap-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionscrap-record-detail/get-import-template' })
+}
--- a/src/api/wms/productionscrapRecordMain/index.ts
+++ b/src/api/wms/productionscrapRecordMain/index.ts
@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface ProductionscrapRecordMainVO {
+  id: number
+  requestNumber: string
+  jobNumber: string
+  workshopCode: string
+  details: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  userGroupCode: string
+  interfaceType: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  code: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+}
+
+// 查询线边原料报废记录主列表
+export const getProductionscrapRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionscrap-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionscrap-record-main/page`, params })
+  }
+}
+
+// 查询线边原料报废记录主详情
+export const getProductionscrapRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/productionscrap-record-main/get?id=` + id })
+}
+
+// 新增线边原料报废记录主
+export const createProductionscrapRecordMain = async (data: ProductionscrapRecordMainVO) => {
+  return await request.post({ url: `/wms/productionscrap-record-main/create`, data })
+}
+
+// 修改线边原料报废记录主
+export const updateProductionscrapRecordMain = async (data: ProductionscrapRecordMainVO) => {
+  return await request.put({ url: `/wms/productionscrap-record-main/update`, data })
+}
+
+// 删除线边原料报废记录主
+export const deleteProductionscrapRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productionscrap-record-main/delete?id=` + id })
+}
+
+// 导出线边原料报废记录主 Excel
+export const exportProductionscrapRecordMain = async (params) => {
+  return await request.download({ url: `/wms/productionscrap-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionscrap-record-main/get-import-template' })
+}
--- a/src/api/wms/productionscrapRequestDetail/index.ts
+++ b/src/api/wms/productionscrapRequestDetail/index.ts
@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface ProductionscrapRequestDetailVO {
+  id: number
+  productionLineCode: string
+  workStationCode: string
+  inventoryStatus: string
+  packingNumber: string
+  containerNumber: string
+  batch: string
+  fromLocationCode: string
+  masterId: number
+  number: string
+  itemCode: string
+  remark: string
+  siteId: string
+  itemName: string
+  itemDesc1: string
+  itemDesc2: string
+  projectCode: string
+  qty: number
+  uom: string
+  packUnit: string
+  packQty: number
+  fromOwnerCode: string
+  toOwnerCode: string
+  concurrencyStamp: number
+}
+
+// 查询线边原料报废子列表
+export const getProductionscrapRequestDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionscrap-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionscrap-request-detail/page`, params })
+  }
+}
+
+// 查询线边原料报废子详情
+export const getProductionscrapRequestDetail = async (id: number) => {
+  return await request.get({ url: `/wms/productionscrap-request-detail/get?id=` + id })
+}
+
+// 新增线边原料报废子
+export const createProductionscrapRequestDetail = async (data: ProductionscrapRequestDetailVO) => {
+  return await request.post({ url: `/wms/productionscrap-request-detail/create`, data })
+}
+
+// 修改线边原料报废子
+export const updateProductionscrapRequestDetail = async (data: ProductionscrapRequestDetailVO) => {
+  return await request.put({ url: `/wms/productionscrap-request-detail/update`, data })
+}
+
+// 删除线边原料报废子
+export const deleteProductionscrapRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/productionscrap-request-detail/delete?id=` + id })
+}
+
+// 导出线边原料报废子 Excel
+export const exportProductionscrapRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/productionscrap-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionscrap-request-detail/get-import-template' })
+}
--- a/src/api/wms/productionscrapRequestMain/index.ts
+++ b/src/api/wms/productionscrapRequestMain/index.ts
@ -0,0 +1,102 @@
+import request from '@/config/axios'
+
+export interface ProductionscrapRequestMainVO {
+  id: number
+  workshopCode: string
+  fromWarehouseCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  details: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  status: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  concurrencyStamp: number
+  ruleUserId: number
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  serialNumber: string
+  inInventoryStatuses: string
+  outInventoryStatuses: string
+}
+
+// 查询线边原料报废主列表
+export const getProductionscrapRequestMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionscrap-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionscrap-request-main/page`, params })
+  }
+}
+
+// 查询线边原料报废主详情
+export const getProductionscrapRequestMain = async (id: number) => {
+  return await request.get({ url: `/wms/productionscrap-request-main/get?id=` + id })
+}
+
+// 新增线边原料报废主
+export const createProductionscrapRequestMain = async (data: ProductionscrapRequestMainVO) => {
+  return await request.post({ url: `/wms/productionscrap-request-main/create`, data })
+}
+
+// 修改线边原料报废主
+export const updateProductionscrapRequestMain = async (data: ProductionscrapRequestMainVO) => {
+  return await request.put({ url: `/wms/productionscrap-request-main/update`, data })
+}
+
+// 删除线边原料报废主
+export const deleteProductionscrapRequestMain = async (id: number) => {
+  return await request.delete({ url: `/wms/productionscrap-request-main/delete?id=` + id })
+}
+
+// 导出线边原料报废主 Excel
+export const exportProductionscrapRequestMain = async (params) => {
+  return await request.download({ url: `/wms/productionscrap-request-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/productionscrap-request-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/productionscrap-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/productionscrap-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/productionscrap-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/productionscrap-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/productionscrap-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/productionscrap-request-main/handle?id=' + id })
+}
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
@ -0,0 +1,179 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ProductionreturnRecordMain.allSchemas.searchSchema,...ProductionreturnRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionreturnRecordMain.allSchemas"
+      :detailAllSchemas="ProductionreturnRecordDetail.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 }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="ProductionreturnRecordMainRules"
+    :formAllSchemas="ProductionreturnRecordMain.allSchemas"
+    :tableAllSchemas="ProductionreturnRecordDetail.allSchemas"
+    :tableFormRules="ProductionreturnRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionreturnRecordMain.allSchemas"
+    :detailAllSchemas="ProductionreturnRecordDetail.allSchemas"
+    :detailAllSchemasRules="ProductionreturnRecordDetailRules"
+    :apiPage="ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ProductionreturnRecordMain,ProductionreturnRecordMainRules,ProductionreturnRecordDetail,ProductionreturnRecordDetailRules } from './productionscrapRecordMain.data'
+import * as ProductionreturnRecordMainApi from '@/api/wms/productionreturnRecordMain'
+import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 生产退料记录主
+defineOptions({ name: 'ProductionscrapRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...ProductionreturnRecordMain.allSchemas.tableColumns,...ProductionreturnRecordDetail.allSchemas.tableMainColumns])
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-record-main: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 == '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 butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  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,"recordProductionreturnMain")
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params)
+    download.excel(data, '生产退料记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@ -0,0 +1,685 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 生产退料记录主表
+ */
+export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    isSearch: true
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: 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',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductionreturnRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 生产退料记录子表
+ */
+export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain: true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+]))
+
+//表单校验
+export const ProductionreturnRecordDetailRules = reactive({
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  frompackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  frombatch: [
+    { required: true, message: '请输入从批次', trigger: 'change' }
+  ],
+  fromlocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromlocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromareaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  topackingNumber: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  tobatch: [
+    { required: true, message: '请输入到批次', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@ -0,0 +1,798 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ProductionscrapRequestMain.allSchemas.searchSchema,...ProductionscrapRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ProductionscrapRequestMain.allSchemas"
+      :detailAllSchemas="ProductionscrapRequestDetail.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 }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="workStationCode"
+    @success="getList"
+    :rules="ProductionscrapRequestMainRules"
+    :formAllSchemas="ProductionscrapRequestMain.allSchemas"
+    :tableAllSchemas="ProductionscrapRequestDetail.allSchemas"
+    :tableFormRules="ProductionscrapRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ProductionscrapRequestMainApi.updateProductionscrapRequestMain"
+    :apiCreate="ProductionscrapRequestMainApi.createProductionscrapRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductionscrapRequestMain.allSchemas"
+    :detailAllSchemas="ProductionscrapRequestDetail.allSchemas"
+    :detailAllSchemasRules="ProductionscrapRequestDetailRules"
+    :apiCreate="ProductionscrapRequestDetailApi.createProductionscrapRequestDetail"
+    :apiUpdate="ProductionscrapRequestDetailApi.updateProductionscrapRequestDetail"
+    :apiPage="ProductionscrapRequestDetailApi.getProductionscrapRequestDetailPage"
+    :apiDelete="ProductionscrapRequestDetailApi.deleteProductionscrapRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
+    :detailValidate="detailValidate"
+  />
+
+  <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductionscrapRequestDetailLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productionscrap-request-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { ProductionscrapRequestMain,ProductionscrapRequestMainRules,ProductionscrapRequestDetail,ProductionscrapRequestDetailRules,ProductionscrapRequestDetailLabel,ProductionscrapRequestDetailLabelRules, SupplierdeliverRequestPackage } from './productionscrapRequestMain.data'
+import * as ProductionscrapRequestMainApi from '@/api/wms/productionscrapRequestMain'
+import * as ProductionscrapRequestDetailApi from '@/api/wms/productionscrapRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
+import { getAccessToken } from '@/utils/auth'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+
+// 生产退料申请
+defineOptions({ name: 'ProductionscrapRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...ProductionscrapRequestMain.allSchemas.tableColumns,...ProductionscrapRequestDetail.allSchemas.tableMainColumns])
+
+//创建标签
+const detailListTableColumns = ProductionscrapRequestDetailLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductionscrapRequestDetailApi.getProductionscrapRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+// 判断 物料类型是否与其他物料类型一致
+const isItemType = async (itemCode, labelTypeParams) => {
+  let isType = false
+  const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
+  await ItembasicApi.getItembasicPage({
+    pageSize: 10,
+    pageNo: 1,
+    code: itemCode,
+    sort: '',
+    by: 'ASC',
+  }).then(res => {
+    if (res.list.length > 0) {
+      // 判断物料 可采购 可制造
+      if (res.list[0].enableMake == "FALSE") {
+        labelType.value = 'cg'
+        if (labelTypeParams == 'cg') {
+          isType = true
+        }
+      } else {
+        labelType.value = 'zz'
+        if (labelTypeParams == 'zz') {
+          isType = true
+        }
+      }
+      if(labelTypeParams == '') isType = true
+    }
+  })
+  // 当第二次选择为不同类型时 类型要重置到第一次选择的结果
+  if (!isType) labelType.value = labelTypeOld
+  return isType
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if(formField == 'itemCode') {
+        if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
+          message.warning(`物料${val[0]['itemCode']}已经存在`)
+          return
+        }
+
+        const isType = await isItemType(val[0]['itemCode'], labelType.value)
+        if(!isType){
+          message.warning('当前物料可制造与其他数据不一致，请重新选择！')
+        } else {
+          row['itemCode'] = val[0]['itemCode']
+          row['uom'] = val[0]['uom']
+          row['inventoryStatus'] = val[0]['inventoryStatus']
+          row['qty'] = val[0]['qty']
+          // 如果有批次 赋值库存余额批次 无批次 赋值 000000
+          if (val[0]['batch'] !== '') {
+            row['batch'] = val[0]['batch']
+          } else {
+            row['batch'] = '000000'
+          }
+          // 修改 tableform 属性 数量最大值设置为库存余额中数量
+          // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制
+          ProductionscrapRequestDetail.allSchemas.tableFormColumns.map(item => {
+            if(item.field == 'qty' && val[0]['qty'] > 0) {
+              item.tableForm.max = val[0]['qty']
+            }
+          })
+        }
+      } else if(formField == 'workStationCode') {
+        // 明细查询页赋值
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['workStationCode'] = item['code']
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          tableData.value.push(newRow)
+        })
+      } else if(formField == 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      tableData.value = [] // 重置明细数据
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(async () => {
+    const setV = {}
+    if(formField == 'itemCode') {
+      const isType = await isItemType(val[0]['itemCode'], labelType.value)
+      if(!isType){
+        message.warning('当前物料可制造与其他数据不一致，请重新选择！')
+      } else {
+        setV['itemCode'] = val[0]['itemCode']
+        setV['uom'] = val[0]['uom']
+        setV['inventoryStatus'] = val[0]['inventoryStatus']
+        setV['qty'] = val[0]['qty']
+        // 如果有批次 赋值库存余额批次 无批次 赋值 000000
+        if (val[0]['batch'] !== '') {
+            setV['batch'] = val[0]['batch']
+          } else {
+            setV['batch'] = '000000'
+          }
+        // 修改 tableform 属性 数量最大值设置为库存余额中数量
+        ProductionscrapRequestDetail.allSchemas.tableFormColumns.map(item => {
+          if(item.field == 'qty' && val[0]['qty'] > 0) {
+            item.tableForm.max = val[0]['qty']
+          }
+        })
+      }
+    } else if(formField == 'workStationCode') {
+      setV['workStationCode'] = val[0]['code']
+      setV['fromLocationCode'] = val[0]['rawLocationCode']
+    } else if(formField == 'packUnit') {
+      setV['packUnit'] = val[0]['packUnit']
+      setV['packQty'] = val[0]['packQty']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ProductionscrapRequestDetailApi.getProductionscrapRequestDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:productionscrap-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productionscrap-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionscrap-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+
+]
+
+// 头部按钮事件
+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:productionscrap-request-main:close'}), // 关闭
+      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productionscrap-request-main:reAdd'}), // 重新添加
+      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionscrap-request-main:submit'}), // 提交审批
+      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionscrap-request-main:refused'}), // 驳回
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionscrap-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productionscrap-request-main:handle'}), // 处理
+      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionscrap-request-main:update'}), // 编辑
+      // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除
+      // 创建标签
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ProductionscrapRequestMainApi.close(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ProductionscrapRequestMainApi.reAdd(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ProductionscrapRequestMainApi.submit(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ProductionscrapRequestMainApi.refused(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ProductionscrapRequestMainApi.agree(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'cjbq') { // 创建标签
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (isCreateLabel) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    detatableData.params = {
+      masterId:row.masterId
+    }
+    await getDetailList()
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      // item.batch = '000000'
+      // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      ItembasicApi.getItembasicPage({
+        pageSize: 10,
+        pageNo: 1,
+        code: item.itemCode,
+        sort: '',
+        by: 'ASC',
+      }).then(res => {
+        if (res.list.length > 0) {
+          // 判断物料 可采购 可制造
+          if (res.list[0].enableMake == "FALSE") {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'productionLineCodePackage') {
+              // itemColumns.tableForm.isInpuFocusShow = false
+              // itemColumns.tableForm.disabled = true
+              ProductionscrapRequestDetailLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = false
+              ProductionscrapRequestDetailLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
+            if(itemColumns.field == 'supplierItemCode') {
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
+              ProductionscrapRequestDetailLabelRules.supplierItemCode[0].required = false
+            }
+            if(itemColumns.field == 'productionLineCodePackage') {
+              item.productionLineCodePackage = item.productionLineCode
+              // itemColumns.tableForm.isInpuFocusShow = true
+              // itemColumns.tableForm.disabled = false
+              ProductionscrapRequestDetailLabelRules.productionLineCodePackage[0].required = true
+            }
+          })
+          }
+        } else {
+          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
+
+  } else if (val == 'mainHandle') { // 处理
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
+    tableObject.loading = true
+    ProductionscrapRequestMainApi.handle(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.masterId)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  // 编辑时 车间代码不可修改
+  if (type == 'update') {
+    // 修改 tableform 属性
+    ProductionscrapRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+    })
+  } else {
+    // 修改 tableform 属性
+    ProductionscrapRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'workshopCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 批量打印--生产退料
+const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  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,"requestProductionreturnMain")
+}
+/** 详情操作——子表表单 */
+const detailOpenForm = (type, row) => {
+  nextTick(()=>{
+    // detailRef.value.formRef.formRef.formModel.batch = '000000'
+  })
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await ProductionscrapRequestMainApi.deleteProductionscrapRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductionscrapRequestMainApi.exportProductionscrapRequestMain(tableObject.params)
+    download.excel(data, '生产退料合格申请.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductionscrapRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  // tfk.batch = '000000'
+  tableData.value.push(tfk)
+}
+// 删除明细
+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))
+}
+
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  data.subList = tableData.value // 拼接子表数据参数
+  let isZC = true // 数量和标包数量 是否整除
+  data.subList.forEach(item => {
+    item.productionLineCode = data.productionLineCode
+    if (item.qty % item.packQty !== 0) {
+      isZC = false
+    }
+  })
+  if(!isZC) {
+    formRef.value.formLoading = false
+    await message.confirm('含有不整箱情况,是否继续?')
+    formRef.value.formLoading = true
+  }
+  // 合格退料 添加参数 isOK
+  data.isOK = true
+  try {
+    if (formType === 'create') {
+      // 子表不能为空
+      if (tableData.value.length == 0) {
+        formRef.value.formLoading = false
+        return message.warning('请添加明细数据！')
+      }
+      await ProductionscrapRequestMainApi.createProductionscrapRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionscrapRequestMainApi.updateProductionscrapRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 创建标签
+const submitFormLabel = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      item.toLocationCode = item.fromLocationCode
+      await PackageApi.createPackageLabel(item).then(() => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+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].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    } else {
+      isCreateLabel.value = false
+    }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    labelPrint(row)
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+const searchTableRef = ref()
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.number}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '生产退料导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params.isSearch = true
+  if(!searchData.filters){//重置的时候应用
+    searchData.filters = []
+  }
+  let filters = [...searchData.filters]
+  if(!filters.find(item=>item.column=='business_type')) {
+    filters = [...filters,{
+      action:'==',
+      column:'business_type',
+      value:'ReturnToStore',
+    }]
+  }
+  tableObject.params.filters = filters
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ProductionscrapRequestMainApi.importTemplate()
+})
+</script>
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@ -989,7 +989,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
          isMainValue: false
        },{
          key: 'businessType',
-          value: 'PurchaseReceipt',
+          value: 'PurchaseReceiptSpare',
          isMainValue: false
        },{
          key: 'isIn',
@ -1020,7 +1020,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
        isMainValue: false
      },{
        key: 'businessType',
-        value: 'PurchaseReceipt',
+        value: 'PurchaseReceiptSpare',
        isMainValue: false
      },{
        key: 'isIn',